diff options
Diffstat (limited to 'pkgs')
913 files changed, 25673 insertions, 16680 deletions
diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index 32cec811d002c..a284be4383250 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -21,15 +21,16 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - postInstall = '' + postInstall = lib.optionalString stdenv.isLinux '' patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng ''; meta = with stdenv.lib; { description = "Open source speech synthesizer that supports over 70 languages, based on eSpeak"; - homepage = src.meta.homepage; + homepage = "https://github.com/espeak-ng/espeak-ng"; + changelog = "https://github.com/espeak-ng/espeak-ng/blob/${version}/CHANGELOG.md"; license = licenses.gpl3; maintainers = with maintainers; [ aske ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 4a21868f09727..b153298d978bc 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.10.16"; + version = "3.10.17"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0pbpaasd7kj6y25nm45y1qyb9sxd4570f7g6zkfcpf6pa3nx7qkq"; + sha256 = "0wrk8d4q6ricbcjzlhk10vrk1qg9hi323kgyyd0c8nmh7a82h8pd"; }; patches = [ diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index 5fbfdc787eb74..a4f586712831a 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.1"; + version = "3.3"; src = fetchFromGitHub { owner = "helio-fm"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "10pna4k43g648gapviykq2zk82iwy5rqff4lbfh5vzxqpg5v4ma6"; + sha256 = "sha256-meeNqV1jKUwWc7P3p/LicPsbpzpKKFmQ1wP9DuXc9NY="; }; buildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "One music sequencer for all major platforms, both desktop and mobile"; homepage = "https://helio.fm/"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = [ maintainers.suhr ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 48f955fd7137d..a8530a30458ff 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.50.0"; + version = "3.54.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "04miwf0dqb8jir9g7xkfnn3l62bdn74ap03kqzz2v3byg64f1p0g"; + sha256 = "0qnshn77dv7fl6smwnpnbq67mbc1vic9gf85skiqnqy8v8w5829f"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/local.nix b/pkgs/applications/audio/mopidy/local.nix index 43554280565e2..6cbb8424d35dd 100644 --- a/pkgs/applications/audio/mopidy/local.nix +++ b/pkgs/applications/audio/mopidy/local.nix @@ -5,11 +5,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Local"; - version = "3.1.1"; + version = "3.2.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "13m0iz14lyplnpm96gfpisqvv4n89ls30kmkg21z7v238lm0h19j"; + sha256 = "14f78sb3wkg83dg3xcqlq77dh059zzcwry5l9ilyhnmvmyrkhqx0"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/tunein.nix b/pkgs/applications/audio/mopidy/tunein.nix index 9ab0323205283..90deea7c02bac 100644 --- a/pkgs/applications/audio/mopidy/tunein.nix +++ b/pkgs/applications/audio/mopidy/tunein.nix @@ -2,21 +2,18 @@ python3Packages.buildPythonApplication rec { pname = "mopidy-tunein"; - version = "1.0.0"; + version = "1.0.2"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-TuneIn"; - sha256 = "0insasf4w8ajsqjh5zmax7pkzmrk1p245vh4y8ddicldj45p6qfj"; + sha256 = "1mvfhka8wi835yk9869yn3b6mdkfwqkylp14vpjkbm42d0kj4lkc"; }; propagatedBuildInputs = [ mopidy ]; - # tests fail with "ValueError: Namespace Gst not available" in mopidy itself - doCheck = false; - pythonImportsCheck = [ "mopidy_tunein.tunein" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix index f2b4564c7ccf5..9bf0b5b8f64c4 100644 --- a/pkgs/applications/audio/mp3gain/default.nix +++ b/pkgs/applications/audio/mp3gain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mpg123 }: +{ stdenv, fetchurl, fetchpatch, unzip, mpg123 }: stdenv.mkDerivation { name = "mp3gain-1.6.2"; @@ -11,17 +11,25 @@ stdenv.mkDerivation { sourceRoot = "."; + patches = [ + (fetchpatch { + name = "0001-fix-security-bugs.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/mp3gain/files/mp3gain-1.6.2-CVE-2019-18359-plus.patch?id=36f8689f7903548f5d89827a6e7bdf70a9882cee"; + sha256 = "10n53wm0xynlcxqlnaqfgamjzcpfz41q1jlg0bhw4kq1kzhs4yyw"; + }) + ]; + buildFlags = [ "OSTYPE=linux" ]; installPhase = '' install -vD mp3gain "$out/bin/mp3gain" ''; - meta = { + meta = with stdenv.lib; { description = "Lossless mp3 normalizer with statistical analysis"; homepage = "http://mp3gain.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ devhell ]; }; } diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index f8adc522fcb5e..33308ebc61ab6 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -12,11 +12,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { pname = "ncmpcpp"; - version = "0.8.2"; + version = "0.9.1"; src = fetchurl { - url = "https://ncmpcpp.rybczak.net/stable/${pname}-${version}.tar.bz2"; - sha256 = "0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5"; + url = "https://rybczak.net/ncmpcpp/stable/${pname}-${version}.tar.bz2"; + sha256 = "0x35nd4v31sma8fliqdbn1nxpjyi8hv472318sfb3xbmr4wlm0fb"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { meta = { description = "A featureful ncurses based MPD client inspired by ncmpc"; - homepage = "https://ncmpcpp.rybczak.net/"; + homepage = "https://rybczak.net/ncmpcpp/"; + changelog = "https://github.com/ncmpcpp/ncmpcpp/blob/${version}/CHANGELOG.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jfrankenau koral lovek323 ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 623682f417382..a1019880318ec 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "19jy1ma2viqnyfbqdpm4cf8mpdrc0xyxrk7sayx1b7dqmkxcyp5c"; + sha256 = "0x40qzgw9zcih4q6mzclb7gqkw8h76hrmqzmg6nimpla29jcdxss"; }; - cargoSha256 = "0lgd4ff70qsjplm847hkx1hgs3kpwv2ahmgyhsld3mng3k7qfm09"; + cargoSha256 = "1pfl7cblf7d4ci514vlkdh1ybgby71x4aszxmlsrqmn92bq56jys"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; diff --git a/pkgs/applications/audio/netease-music-tui/cargo-lock.patch b/pkgs/applications/audio/netease-music-tui/cargo-lock.patch new file mode 100644 index 0000000000000..2b3366476d639 --- /dev/null +++ b/pkgs/applications/audio/netease-music-tui/cargo-lock.patch @@ -0,0 +1,2309 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..45720a8 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,2303 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "addr2line" ++version = "0.14.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423" ++dependencies = [ ++ "gimli", ++] ++ ++[[package]] ++name = "adler" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "alsa-sys" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b0edcbbf9ef68f15ae1b620f722180b82a98b6f0628d30baa6b8d2a5abc87d58" ++dependencies = [ ++ "libc", ++ "pkg-config", ++] ++ ++[[package]] ++name = "arrayref" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" ++ ++[[package]] ++name = "arrayvec" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" ++ ++[[package]] ++name = "async-compression" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b72c1f1154e234325b50864a349b9c8e56939e266a4c307c0f159812df2f9537" ++dependencies = [ ++ "bytes 0.5.6", ++ "flate2", ++ "futures-core", ++ "memchr", ++ "pin-project-lite 0.2.0", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598" ++dependencies = [ ++ "addr2line", ++ "cfg-if 1.0.0", ++ "libc", ++ "miniz_oxide", ++ "object", ++ "rustc-demangle", ++] ++ ++[[package]] ++name = "base-x" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" ++ ++[[package]] ++name = "base64" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" ++ ++[[package]] ++name = "base64" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ++ ++[[package]] ++name = "bindgen" ++version = "0.56.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239" ++dependencies = [ ++ "bitflags", ++ "cexpr", ++ "clang-sys", ++ "lazy_static 1.4.0", ++ "lazycell", ++ "peeking_take_while", ++ "proc-macro2", ++ "quote", ++ "regex", ++ "rustc-hash", ++ "shlex", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "blake2b_simd" ++version = "0.5.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" ++dependencies = [ ++ "arrayref", ++ "arrayvec", ++ "constant_time_eq", ++] ++ ++[[package]] ++name = "bumpalo" ++version = "3.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" ++ ++[[package]] ++name = "byteorder" ++version = "1.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" ++ ++[[package]] ++name = "bytes" ++version = "0.4.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" ++dependencies = [ ++ "byteorder", ++ "iovec", ++] ++ ++[[package]] ++name = "bytes" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" ++ ++[[package]] ++name = "cassowary" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" ++ ++[[package]] ++name = "cc" ++version = "1.0.66" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" ++ ++[[package]] ++name = "cexpr" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" ++dependencies = [ ++ "nom 5.1.2", ++] ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "chrono" ++version = "0.4.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" ++dependencies = [ ++ "libc", ++ "num-integer", ++ "num-traits 0.2.14", ++ "time 0.1.44", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "clang-sys" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0659001ab56b791be01d4b729c44376edc6718cf389a502e579b77b758f3296c" ++dependencies = [ ++ "glob", ++ "libc", ++ "libloading", ++] ++ ++[[package]] ++name = "claxon" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" ++ ++[[package]] ++name = "config" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f9107d78ed62b3fa5a86e7d18e647abed48cfd8f8fab6c72f4cdb982d196f7e6" ++dependencies = [ ++ "lazy_static 1.4.0", ++ "nom 4.2.3", ++ "rust-ini", ++ "serde 1.0.118", ++ "serde-hjson", ++ "serde_json", ++ "toml", ++ "yaml-rust", ++] ++ ++[[package]] ++name = "const_fn" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826" ++ ++[[package]] ++name = "constant_time_eq" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" ++ ++[[package]] ++name = "cookie" ++version = "0.14.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "784ad0fbab4f3e9cef09f20e0aea6000ae08d2cb98ac4c0abc53df18803d702f" ++dependencies = [ ++ "percent-encoding", ++ "time 0.2.23", ++ "version_check 0.9.2", ++] ++ ++[[package]] ++name = "cookie_store" ++version = "0.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3818dfca4b0cb5211a659bbcbb94225b7127407b2b135e650d717bfb78ab10d3" ++dependencies = [ ++ "cookie", ++ "idna", ++ "log", ++ "publicsuffix", ++ "serde 1.0.118", ++ "serde_json", ++ "time 0.2.23", ++ "url", ++] ++ ++[[package]] ++name = "core-foundation" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" ++dependencies = [ ++ "core-foundation-sys 0.8.2", ++ "libc", ++] ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" ++ ++[[package]] ++name = "coreaudio-rs" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f229761965dad3e9b11081668a6ea00f1def7aa46062321b5ec245b834f6e491" ++dependencies = [ ++ "bitflags", ++ "coreaudio-sys", ++] ++ ++[[package]] ++name = "coreaudio-sys" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2b7e3347be6a09b46aba228d6608386739fb70beff4f61e07422da87b0bb31fa" ++dependencies = [ ++ "bindgen", ++] ++ ++[[package]] ++name = "cpal" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ded070249be850b5b59e1e3a44a70b8ae395e0e5c65b487131d8909a8208120" ++dependencies = [ ++ "alsa-sys", ++ "core-foundation-sys 0.6.2", ++ "coreaudio-rs", ++ "failure", ++ "lazy_static 1.4.0", ++ "libc", ++ "num-traits 0.2.14", ++ "stdweb 0.1.3", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "crc32fast" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" ++dependencies = [ ++ "autocfg", ++ "cfg-if 1.0.0", ++ "lazy_static 1.4.0", ++] ++ ++[[package]] ++name = "dbus" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "add8dd36d6d34a084220eb9fe216d3e230d52b37c31702e1ffda4fb2d4ef950e" ++dependencies = [ ++ "libc", ++ "libdbus-sys", ++] ++ ++[[package]] ++name = "dirs" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "dirs-sys", ++] ++ ++[[package]] ++name = "dirs-sys" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" ++dependencies = [ ++ "libc", ++ "redox_users", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "discard" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" ++ ++[[package]] ++name = "dtoa" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" ++ ++[[package]] ++name = "either" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++ ++[[package]] ++name = "encoding_rs" ++version = "0.8.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "801bbab217d7f79c0062f4f7205b5d4427c6d1a7bd7aafdd1475f7c59d62b283" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "error-chain" ++version = "0.12.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" ++dependencies = [ ++ "version_check 0.9.2", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" ++dependencies = [ ++ "backtrace", ++ "failure_derive", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "synstructure", ++] ++ ++[[package]] ++name = "flate2" ++version = "1.0.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "crc32fast", ++ "libc", ++ "miniz_oxide", ++] ++ ++[[package]] ++name = "fnv" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" ++ ++[[package]] ++name = "foreign-types" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" ++dependencies = [ ++ "foreign-types-shared", ++] ++ ++[[package]] ++name = "foreign-types-shared" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++ ++[[package]] ++name = "form_urlencoded" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00" ++dependencies = [ ++ "matches", ++ "percent-encoding", ++] ++ ++[[package]] ++name = "fuchsia-zircon" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" ++dependencies = [ ++ "bitflags", ++ "fuchsia-zircon-sys", ++] ++ ++[[package]] ++name = "fuchsia-zircon-sys" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" ++ ++[[package]] ++name = "futures" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "futures-executor", ++ "futures-io", ++ "futures-sink", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-channel" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64" ++dependencies = [ ++ "futures-core", ++ "futures-sink", ++] ++ ++[[package]] ++name = "futures-core" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748" ++ ++[[package]] ++name = "futures-executor" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65" ++dependencies = [ ++ "futures-core", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-io" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb" ++ ++[[package]] ++name = "futures-macro" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556" ++dependencies = [ ++ "proc-macro-hack", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "futures-sink" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d" ++ ++[[package]] ++name = "futures-task" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d" ++dependencies = [ ++ "once_cell", ++] ++ ++[[package]] ++name = "futures-util" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "futures-macro", ++ "futures-sink", ++ "futures-task", ++ "memchr", ++ "pin-project 1.0.2", ++ "pin-utils", ++ "proc-macro-hack", ++ "proc-macro-nested", ++ "slab", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "libc", ++ "wasi 0.9.0+wasi-snapshot-preview1", ++] ++ ++[[package]] ++name = "gimli" ++version = "0.23.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" ++ ++[[package]] ++name = "glob" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" ++ ++[[package]] ++name = "h2" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" ++dependencies = [ ++ "bytes 0.5.6", ++ "fnv", ++ "futures-core", ++ "futures-sink", ++ "futures-util", ++ "http", ++ "indexmap", ++ "slab", ++ "tokio", ++ "tokio-util", ++ "tracing", ++ "tracing-futures", ++] ++ ++[[package]] ++name = "hashbrown" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "hex" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" ++ ++[[package]] ++name = "hound" ++version = "3.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549" ++ ++[[package]] ++name = "http" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "84129d298a6d57d246960ff8eb831ca4af3f96d29e2e28848dae275408658e26" ++dependencies = [ ++ "bytes 0.5.6", ++ "fnv", ++ "itoa", ++] ++ ++[[package]] ++name = "http-body" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" ++dependencies = [ ++ "bytes 0.5.6", ++ "http", ++] ++ ++[[package]] ++name = "httparse" ++version = "1.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" ++ ++[[package]] ++name = "httpdate" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" ++ ++[[package]] ++name = "hyper" ++version = "0.13.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" ++dependencies = [ ++ "bytes 0.5.6", ++ "futures-channel", ++ "futures-core", ++ "futures-util", ++ "h2", ++ "http", ++ "http-body", ++ "httparse", ++ "httpdate", ++ "itoa", ++ "pin-project 1.0.2", ++ "socket2", ++ "tokio", ++ "tower-service", ++ "tracing", ++ "want", ++] ++ ++[[package]] ++name = "hyper-tls" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" ++dependencies = [ ++ "bytes 0.5.6", ++ "hyper", ++ "native-tls", ++ "tokio", ++ "tokio-tls", ++] ++ ++[[package]] ++name = "idna" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" ++dependencies = [ ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", ++] ++ ++[[package]] ++name = "indexmap" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" ++dependencies = [ ++ "autocfg", ++ "hashbrown", ++] ++ ++[[package]] ++name = "iovec" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "ipnet" ++version = "2.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" ++ ++[[package]] ++name = "itertools" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" ++dependencies = [ ++ "either", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" ++ ++[[package]] ++name = "js-sys" ++version = "0.3.46" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175" ++dependencies = [ ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++dependencies = [ ++ "winapi 0.2.8", ++ "winapi-build", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "lazycell" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" ++ ++[[package]] ++name = "lewton" ++version = "0.9.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d542c1a317036c45c2aa1cf10cc9d403ca91eb2d333ef1a4917e5cb10628bd0" ++dependencies = [ ++ "byteorder", ++ "ogg", ++ "smallvec", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.81" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" ++ ++[[package]] ++name = "libdbus-sys" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc12a3bc971424edbbf7edaf6e5740483444db63aa8e23d3751ff12a30f306f0" ++dependencies = [ ++ "pkg-config", ++] ++ ++[[package]] ++name = "libloading" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e9367bdfa836b7e3cf895867f7a570283444da90562980ec2263d6e1569b16bc" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "linked-hash-map" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd" ++dependencies = [ ++ "serde 0.8.23", ++ "serde_test", ++] ++ ++[[package]] ++name = "linked-hash-map" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" ++ ++[[package]] ++name = "log" ++version = "0.4.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" ++dependencies = [ ++ "cfg-if 0.1.10", ++] ++ ++[[package]] ++name = "log-panics" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae0136257df209261daa18d6c16394757c63e032e27aafd8b07788b051082bef" ++dependencies = [ ++ "log", ++] ++ ++[[package]] ++name = "mach" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++ ++[[package]] ++name = "maybe-uninit" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" ++ ++[[package]] ++name = "memchr" ++version = "2.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" ++ ++[[package]] ++name = "mime" ++version = "0.3.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" ++ ++[[package]] ++name = "mime_guess" ++version = "2.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" ++dependencies = [ ++ "mime", ++ "unicase", ++] ++ ++[[package]] ++name = "minimp3" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dce0cff6a0bfd3f8b6b2350819bbddd63bc65cc45e53888bdd0ff49dde16d2d5" ++dependencies = [ ++ "minimp3-sys", ++ "slice-deque", ++] ++ ++[[package]] ++name = "minimp3-sys" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e21c73734c69dc95696c9ed8926a2b393171d98b3f5f5935686a26a487ab9b90" ++dependencies = [ ++ "cc", ++] ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" ++dependencies = [ ++ "adler", ++ "autocfg", ++] ++ ++[[package]] ++name = "mio" ++version = "0.6.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "fuchsia-zircon", ++ "fuchsia-zircon-sys", ++ "iovec", ++ "kernel32-sys", ++ "libc", ++ "log", ++ "miow", ++ "net2", ++ "slab", ++ "winapi 0.2.8", ++] ++ ++[[package]] ++name = "miow" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" ++dependencies = [ ++ "kernel32-sys", ++ "net2", ++ "winapi 0.2.8", ++ "ws2_32-sys", ++] ++ ++[[package]] ++name = "mp3-duration" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "348bdc7300502f0801e5b57c448815713cd843b744ef9bda252a2698fdf90a0f" ++dependencies = [ ++ "thiserror", ++] ++ ++[[package]] ++name = "native-tls" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f" ++dependencies = [ ++ "lazy_static 1.4.0", ++ "libc", ++ "log", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile", ++] ++ ++[[package]] ++name = "net2" ++version = "0.2.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "netease_music_tui" ++version = "0.1.1" ++dependencies = [ ++ "base64 0.11.0", ++ "byteorder", ++ "bytes 0.4.12", ++ "chrono", ++ "config", ++ "dbus", ++ "dirs", ++ "failure", ++ "futures", ++ "hex", ++ "lazy_static 1.4.0", ++ "log", ++ "log-panics", ++ "mp3-duration", ++ "num-bigint", ++ "openssl", ++ "rand", ++ "regex", ++ "reqwest", ++ "rodio", ++ "serde 1.0.118", ++ "serde_derive", ++ "serde_json", ++ "serde_urlencoded 0.6.1", ++ "simple-logging", ++ "tempfile", ++ "termion", ++ "tokio", ++ "tui", ++ "unicode-width", ++] ++ ++[[package]] ++name = "nom" ++version = "4.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" ++dependencies = [ ++ "memchr", ++ "version_check 0.1.5", ++] ++ ++[[package]] ++name = "nom" ++version = "5.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" ++dependencies = [ ++ "memchr", ++ "version_check 0.9.2", ++] ++ ++[[package]] ++name = "num-bigint" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" ++dependencies = [ ++ "autocfg", ++ "num-integer", ++ "num-traits 0.2.14", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" ++dependencies = [ ++ "autocfg", ++ "num-traits 0.2.14", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.1.43" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" ++dependencies = [ ++ "num-traits 0.2.14", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "numtoa" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" ++ ++[[package]] ++name = "object" ++version = "0.22.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" ++ ++[[package]] ++name = "ogg" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "13e571c3517af9e1729d4c63571a27edd660ade0667973bfc74a67c660c2b651" ++dependencies = [ ++ "byteorder", ++] ++ ++[[package]] ++name = "once_cell" ++version = "1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" ++ ++[[package]] ++name = "openssl" ++version = "0.10.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70" ++dependencies = [ ++ "bitflags", ++ "cfg-if 1.0.0", ++ "foreign-types", ++ "lazy_static 1.4.0", ++ "libc", ++ "openssl-sys", ++] ++ ++[[package]] ++name = "openssl-probe" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.60" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6" ++dependencies = [ ++ "autocfg", ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "peeking_take_while" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" ++ ++[[package]] ++name = "percent-encoding" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" ++ ++[[package]] ++name = "pin-project" ++version = "0.4.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" ++dependencies = [ ++ "pin-project-internal 0.4.27", ++] ++ ++[[package]] ++name = "pin-project" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7" ++dependencies = [ ++ "pin-project-internal 1.0.2", ++] ++ ++[[package]] ++name = "pin-project-internal" ++version = "0.4.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "pin-project-internal" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "pin-project-lite" ++version = "0.1.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" ++ ++[[package]] ++name = "pin-project-lite" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c" ++ ++[[package]] ++name = "pin-utils" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" ++ ++[[package]] ++name = "proc-macro-hack" ++version = "0.5.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" ++ ++[[package]] ++name = "proc-macro-nested" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "publicsuffix" ++version = "1.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b" ++dependencies = [ ++ "error-chain", ++ "idna", ++ "lazy_static 1.4.0", ++ "regex", ++ "url", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++dependencies = [ ++ "getrandom", ++ "libc", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++dependencies = [ ++ "getrandom", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++dependencies = [ ++ "rand_core", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.57" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" ++ ++[[package]] ++name = "redox_termios" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" ++dependencies = [ ++ "redox_syscall", ++] ++ ++[[package]] ++name = "redox_users" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" ++dependencies = [ ++ "getrandom", ++ "redox_syscall", ++ "rust-argon2", ++] ++ ++[[package]] ++name = "regex" ++version = "1.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" ++dependencies = [ ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "reqwest" ++version = "0.10.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" ++dependencies = [ ++ "async-compression", ++ "base64 0.13.0", ++ "bytes 0.5.6", ++ "cookie", ++ "cookie_store", ++ "encoding_rs", ++ "futures-core", ++ "futures-util", ++ "http", ++ "http-body", ++ "hyper", ++ "hyper-tls", ++ "ipnet", ++ "js-sys", ++ "lazy_static 1.4.0", ++ "log", ++ "mime", ++ "mime_guess", ++ "native-tls", ++ "percent-encoding", ++ "pin-project-lite 0.2.0", ++ "serde 1.0.118", ++ "serde_urlencoded 0.7.0", ++ "time 0.2.23", ++ "tokio", ++ "tokio-socks", ++ "tokio-tls", ++ "url", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "web-sys", ++ "winreg", ++] ++ ++[[package]] ++name = "rodio" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e0e0dfa7c8b17c6428f6e992a22ea595922cc86f946191b6b59e7ce96b77262" ++dependencies = [ ++ "claxon", ++ "cpal", ++ "hound", ++ "lazy_static 1.4.0", ++ "lewton", ++ "minimp3", ++] ++ ++[[package]] ++name = "rust-argon2" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" ++dependencies = [ ++ "base64 0.13.0", ++ "blake2b_simd", ++ "constant_time_eq", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "rust-ini" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" ++ ++[[package]] ++name = "rustc-hash" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++dependencies = [ ++ "semver", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++ ++[[package]] ++name = "schannel" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" ++dependencies = [ ++ "lazy_static 1.4.0", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "security-framework" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69" ++dependencies = [ ++ "bitflags", ++ "core-foundation", ++ "core-foundation-sys 0.8.2", ++ "libc", ++ "security-framework-sys", ++] ++ ++[[package]] ++name = "security-framework-sys" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b" ++dependencies = [ ++ "core-foundation-sys 0.8.2", ++ "libc", ++] ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++dependencies = [ ++ "semver-parser", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++ ++[[package]] ++name = "serde" ++version = "0.8.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" ++ ++[[package]] ++name = "serde" ++version = "1.0.118" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde-hjson" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b833c5ad67d52ced5f5938b2980f32a9c1c5ef047f0b4fb3127e7a423c76153" ++dependencies = [ ++ "lazy_static 0.2.11", ++ "linked-hash-map 0.3.0", ++ "num-traits 0.1.43", ++ "regex", ++ "serde 0.8.23", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.118" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.60" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779" ++dependencies = [ ++ "itoa", ++ "ryu", ++ "serde 1.0.118", ++] ++ ++[[package]] ++name = "serde_test" ++version = "0.8.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5" ++dependencies = [ ++ "serde 0.8.23", ++] ++ ++[[package]] ++name = "serde_urlencoded" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" ++dependencies = [ ++ "dtoa", ++ "itoa", ++ "serde 1.0.118", ++ "url", ++] ++ ++[[package]] ++name = "serde_urlencoded" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" ++dependencies = [ ++ "form_urlencoded", ++ "itoa", ++ "ryu", ++ "serde 1.0.118", ++] ++ ++[[package]] ++name = "sha1" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" ++ ++[[package]] ++name = "shlex" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" ++ ++[[package]] ++name = "simple-logging" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b00d48e85675326bb182a2286ea7c1a0b264333ae10f27a937a72be08628b542" ++dependencies = [ ++ "lazy_static 1.4.0", ++ "log", ++ "thread-id", ++] ++ ++[[package]] ++name = "slab" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++ ++[[package]] ++name = "slice-deque" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "31ef6ee280cdefba6d2d0b4b78a84a1c1a3f3a4cec98c2d4231c8bc225de0f25" ++dependencies = [ ++ "libc", ++ "mach", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "smallvec" ++version = "0.6.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" ++dependencies = [ ++ "maybe-uninit", ++] ++ ++[[package]] ++name = "socket2" ++version = "0.3.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "standback" ++version = "0.2.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf906c8b8fc3f6ecd1046e01da1d8ddec83e48c8b08b84dcc02b585a6bedf5a8" ++dependencies = [ ++ "version_check 0.9.2", ++] ++ ++[[package]] ++name = "stdweb" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" ++ ++[[package]] ++name = "stdweb" ++version = "0.4.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" ++dependencies = [ ++ "discard", ++ "rustc_version", ++ "stdweb-derive", ++ "stdweb-internal-macros", ++ "stdweb-internal-runtime", ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "stdweb-derive" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "serde 1.0.118", ++ "serde_derive", ++ "syn", ++] ++ ++[[package]] ++name = "stdweb-internal-macros" ++version = "0.2.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" ++dependencies = [ ++ "base-x", ++ "proc-macro2", ++ "quote", ++ "serde 1.0.118", ++ "serde_derive", ++ "serde_json", ++ "sha1", ++ "syn", ++] ++ ++[[package]] ++name = "stdweb-internal-runtime" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" ++ ++[[package]] ++name = "syn" ++version = "1.0.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a571a711dddd09019ccc628e1b17fe87c59b09d513c06c026877aa708334f37a" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.12.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "libc", ++ "rand", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "termion" ++version = "1.5.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c22cec9d8978d906be5ac94bceb5a010d885c626c4c8855721a4dbd20e3ac905" ++dependencies = [ ++ "libc", ++ "numtoa", ++ "redox_syscall", ++ "redox_termios", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "thread-id" ++version = "3.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" ++dependencies = [ ++ "libc", ++ "redox_syscall", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "thread_local" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" ++dependencies = [ ++ "lazy_static 1.4.0", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" ++dependencies = [ ++ "libc", ++ "wasi 0.10.0+wasi-snapshot-preview1", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "time" ++version = "0.2.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bcdaeea317915d59b2b4cd3b5efcd156c309108664277793f5351700c02ce98b" ++dependencies = [ ++ "const_fn", ++ "libc", ++ "standback", ++ "stdweb 0.4.20", ++ "time-macros", ++ "version_check 0.9.2", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "time-macros" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" ++dependencies = [ ++ "proc-macro-hack", ++ "time-macros-impl", ++] ++ ++[[package]] ++name = "time-macros-impl" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa" ++dependencies = [ ++ "proc-macro-hack", ++ "proc-macro2", ++ "quote", ++ "standback", ++ "syn", ++] ++ ++[[package]] ++name = "tinyvec" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" ++dependencies = [ ++ "tinyvec_macros", ++] ++ ++[[package]] ++name = "tinyvec_macros" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" ++ ++[[package]] ++name = "tokio" ++version = "0.2.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48" ++dependencies = [ ++ "bytes 0.5.6", ++ "fnv", ++ "futures-core", ++ "iovec", ++ "lazy_static 1.4.0", ++ "memchr", ++ "mio", ++ "num_cpus", ++ "pin-project-lite 0.1.11", ++ "slab", ++ "tokio-macros", ++] ++ ++[[package]] ++name = "tokio-macros" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "tokio-socks" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d611fd5d241872372d52a0a3d309c52d0b95a6a67671a6c8f7ab2c4a37fb2539" ++dependencies = [ ++ "bytes 0.4.12", ++ "either", ++ "futures", ++ "thiserror", ++ "tokio", ++] ++ ++[[package]] ++name = "tokio-tls" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" ++dependencies = [ ++ "native-tls", ++ "tokio", ++] ++ ++[[package]] ++name = "tokio-util" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" ++dependencies = [ ++ "bytes 0.5.6", ++ "futures-core", ++ "futures-sink", ++ "log", ++ "pin-project-lite 0.1.11", ++ "tokio", ++] ++ ++[[package]] ++name = "toml" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" ++dependencies = [ ++ "serde 1.0.118", ++] ++ ++[[package]] ++name = "tower-service" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" ++ ++[[package]] ++name = "tracing" ++version = "0.1.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "log", ++ "pin-project-lite 0.2.0", ++ "tracing-core", ++] ++ ++[[package]] ++name = "tracing-core" ++version = "0.1.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" ++dependencies = [ ++ "lazy_static 1.4.0", ++] ++ ++[[package]] ++name = "tracing-futures" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" ++dependencies = [ ++ "pin-project 0.4.27", ++ "tracing", ++] ++ ++[[package]] ++name = "try-lock" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" ++ ++[[package]] ++name = "tui" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "73b422ff4986065d33272b587907654f918a3fe8702786a8110bf68dede0d8ee" ++dependencies = [ ++ "bitflags", ++ "cassowary", ++ "either", ++ "itertools", ++ "log", ++ "termion", ++ "unicode-segmentation", ++ "unicode-width", ++] ++ ++[[package]] ++name = "unicase" ++version = "2.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" ++dependencies = [ ++ "version_check 0.9.2", ++] ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" ++dependencies = [ ++ "matches", ++] ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606" ++dependencies = [ ++ "tinyvec", ++] ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++ ++[[package]] ++name = "url" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e" ++dependencies = [ ++ "form_urlencoded", ++ "idna", ++ "matches", ++ "percent-encoding", ++] ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" ++ ++[[package]] ++name = "version_check" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" ++ ++[[package]] ++name = "version_check" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" ++ ++[[package]] ++name = "want" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" ++dependencies = [ ++ "log", ++ "try-lock", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "wasi" ++version = "0.10.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" ++ ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "serde 1.0.118", ++ "serde_json", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62" ++dependencies = [ ++ "bumpalo", ++ "lazy_static 1.4.0", ++ "log", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-futures" ++version = "0.4.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "js-sys", ++ "wasm-bindgen", ++ "web-sys", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" ++ ++[[package]] ++name = "web-sys" ++version = "0.3.46" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3" ++dependencies = [ ++ "js-sys", ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "winreg" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" ++dependencies = [ ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "ws2_32-sys" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" ++dependencies = [ ++ "winapi 0.2.8", ++ "winapi-build", ++] ++ ++[[package]] ++name = "yaml-rust" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d" ++dependencies = [ ++ "linked-hash-map 0.5.3", ++] diff --git a/pkgs/applications/audio/netease-music-tui/default.nix b/pkgs/applications/audio/netease-music-tui/default.nix new file mode 100644 index 0000000000000..88e8ba6d0bc6a --- /dev/null +++ b/pkgs/applications/audio/netease-music-tui/default.nix @@ -0,0 +1,28 @@ +{ fetchFromGitHub, rustPlatform, lib, alsaLib, pkg-config, openssl }: + +rustPlatform.buildRustPackage rec { + pname = "netease-music-tui"; + version = "v0.1.2"; + + src = fetchFromGitHub { + owner = "betta-cyber"; + repo = "netease-music-tui"; + rev = "${version}"; + sha256 = "0m5b3q493d32kxznm4apn56216l07b1c49km236i03mpfvdw7m1f"; + }; + + cargoPatches = [ ./cargo-lock.patch ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsaLib openssl ]; + + cargoSha256 = "1kfbnwy3lkbhz0ggxwr5n6qd1plipkr1ycr3z2r7c0amrzzbkc7l"; + verifyCargoDeps = true; + + meta = with lib; { + homepage = "https://github.com/betta-cyber/netease-music-tui"; + description = "netease cloud music terminal client by rust"; + maintainers = with maintainers; [ vonfry ]; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix index 1932f239cfd7a..1796927f52983 100644 --- a/pkgs/applications/audio/noisetorch/default.nix +++ b/pkgs/applications/audio/noisetorch/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "NoiseTorch"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lawl"; repo = "NoiseTorch"; rev = version; - sha256 = "14i04rmraxbddcvk0k9c6ak9invln7002g5jms54kcjzv9p39hbf"; + sha256 = "1a4g112h83m55pga8kq2a1wzxpycj59v4bygyjfyi1s09q1y97qg"; }; - patches = [ ./version.patch ./embedlibrnnoise.patch ]; + patches = [ ./version.patch ]; vendorSha256 = null; @@ -21,6 +21,8 @@ buildGoModule rec { buildInputs = [ rnnoise-plugin ]; + postPatch = "substituteInPlace main.go --replace 'librnnoise_ladspa/bin/ladspa/librnnoise_ladspa.so' '$RNNOISE_LADSPA_PLUGIN'"; + preBuild = '' export RNNOISE_LADSPA_PLUGIN="${rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so"; go generate; diff --git a/pkgs/applications/audio/noisetorch/embedlibrnnoise.patch b/pkgs/applications/audio/noisetorch/embedlibrnnoise.patch deleted file mode 100644 index b1782efb8b355..0000000000000 --- a/pkgs/applications/audio/noisetorch/embedlibrnnoise.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/scripts/embedlibrnnoise.go b/scripts/embedlibrnnoise.go -index 43daf80..0b3004b 100644 ---- a/scripts/embedlibrnnoise.go -+++ b/scripts/embedlibrnnoise.go -@@ -8,7 +8,7 @@ import ( - ) - - func main() { -- b, err := ioutil.ReadFile("librnnoise_ladspa/bin/ladspa/librnnoise_ladspa.so") -+ b, err := ioutil.ReadFile(os.Getenv("RNNOISE_LADSPA_PLUGIN")) - if err != nil { - fmt.Printf("Couldn't read librnnoise_ladspa.so: %v\n", err) - os.Exit(1) diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 301e44168d39b..f0a0956f662bf 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3 -, libcanberra-gtk3, gnome3, wrapGAppsHook }: +{ fetchurl, fetchpatch, stdenv, pkgconfig, intltool, libpulseaudio, +gtkmm3 , libcanberra-gtk3, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "pavucontrol"; @@ -10,6 +10,15 @@ stdenv.mkDerivation rec { sha256 = "1qhlkl3g8d7h72xjskii3g1l7la2cavwp69909pzmbi2jyn5pi4g"; }; + patches = [ + # Can be removed with the next version bump + # https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/merge_requests/20 + (fetchpatch { + name = "streamwidget-fix-drop-down-wayland.patch"; + url = "https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/commit/ae278b8643cf1089f66df18713c8154208d9a505.patch"; + sha256 = "066vhxjz6gmi2sp2n4pa1cdsxjnq6yml5js094g5n7ld34p84dpj"; + })]; + buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 gnome3.adwaita-icon-theme ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index fb6f59d0ded74..17d68c1e5dda9 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -12,13 +12,13 @@ let ; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.5.2"; + version = "2.5.5"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "193pk6fhrqar2ra8krj6xdd7sm5qfw0p708iazzwk4b8c8g0q72j"; + sha256 = "0i97cfnfgg4g13ms8x3bq279s4r7jckxxrv3sdz7dxpcn6gkw35s"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index bc89505a1fe24..6fb2fb9687f0a 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.26_fix"; + version = "1.27"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "1ikhgagniiq4irsy8i3g64m6cl61lnfvs163n8gs4hm426yckyb8"; + sha256 = "1hg36pfzgdbhd5bkzi3cpn6v39q8xis2jk7w6qm615r587393pwd"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 8cb28dcfd5af4..4ac64afe85477 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,20 @@ -{ stdenv, mkDerivation, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: +{ stdenv, mkDerivation, fetchFromGitHub +, pkg-config, cmake, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras +# Enable jack session support +, jackSession ? false +}: mkDerivation rec { - version = "0.6.3"; + version = "0.9.0"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally - src = fetchurl { - url = "mirror://sourceforge/qjackctl/${pname}-${version}.tar.gz"; - sha256 = "0zbb4jlx56qvcqyhx34mbagkqf3wbxgj84hk0ppf5cmcrxv67d4x"; + src = fetchFromGitHub { + owner = "rncbc"; + repo = "qjackctl"; + rev = "${pname}_${stdenv.lib.replaceChars ["."] ["_"] version}"; + sha256 = "044kgwk7pfywad4myza0s2kvfkl21zkqq5wgny7n3c43qlcgs3zr"; }; buildInputs = [ @@ -20,13 +26,19 @@ mkDerivation rec { dbus ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - configureFlags = [ "--enable-jack-version" ]; + cmakeFlags = [ + "-DCONFIG_JACK_VERSION=1" + "-DCONFIG_JACK_SESSION=${toString jackSession}" + ]; meta = with stdenv.lib; { description = "A Qt application to control the JACK sound server daemon"; - homepage = "http://qjackctl.sourceforge.net/"; + homepage = "https://github.com/rncbc/qjackctl"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 961314088d1a0..f2d5ae1c80920 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -1,35 +1,79 @@ -{ alsaLib, autoconf, automake, dssi, fetchurl, libjack2 -, ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile -, libtool, libvorbis, lilv, lv2, pkgconfig, qttools, qtbase, rubberband, serd -, sord, sratom, stdenv, suil, wrapQtAppsHook }: +{ alsaLib +, aubio +, cmake +, dssi +, fetchurl +, flac +, libjack2 +, ladspaH +, ladspaPlugins +, liblo +, libmad +, libsamplerate +, libsndfile +, libtool +, libvorbis +, lilv +, lv2 +, mkDerivation +, opusfile +, pkg-config +, qttools +, qtbase +, rubberband +, serd +, sord +, sratom +, stdenv +, suil +}: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qtractor"; - version = "0.9.18"; + version = "0.9.19"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "121vmygdzp37p6f93f8dbbg2m2r55j7amyiapzkqgypgn4vfdbwr"; + sha256 = "sha256-98/trRZRvNRPEA4ASS81qp2rMevpo5TIrtsU1TYMuT0="; }; nativeBuildInputs = [ - autoconf automake libtool pkgconfig qttools wrapQtAppsHook + cmake + libtool + pkg-config + qttools ]; - buildInputs = - [ alsaLib dssi libjack2 ladspaH - ladspaPlugins liblo libmad libsamplerate libsndfile libtool - libvorbis lilv lv2 qtbase rubberband serd sord sratom - suil - ]; - - enableParallelBuilding = true; + buildInputs = [ + alsaLib + aubio + dssi + flac + libjack2 + ladspaH + ladspaPlugins + liblo + libmad + libsamplerate + libsndfile + libtool + libvorbis + lilv + lv2 + opusfile + qtbase + rubberband + serd + sord + sratom + suil + ]; meta = with stdenv.lib; { description = "Audio/MIDI multi-track sequencer"; - homepage = "http://qtractor.sourceforge.net"; + homepage = "https://qtractor.sourceforge.io"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/applications/audio/redoflacs/default.nix b/pkgs/applications/audio/redoflacs/default.nix index 140b163e25cd1..879acdf3a17b2 100644 --- a/pkgs/applications/audio/redoflacs/default.nix +++ b/pkgs/applications/audio/redoflacs/default.nix @@ -5,8 +5,6 @@ , installShellFiles , flac , sox -, withAucdtect ? false -, aucdtect ? null }: stdenv.mkDerivation rec { @@ -36,7 +34,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/redoflacs \ - --prefix PATH : ${stdenv.lib.makeBinPath ([ flac sox ] ++ lib.optional withAucdtect aucdtect)} + --prefix PATH : ${stdenv.lib.makeBinPath ([ flac sox ])} ''; meta = with lib; { diff --git a/pkgs/applications/audio/sc68/default.nix b/pkgs/applications/audio/sc68/default.nix new file mode 100644 index 0000000000000..683aa9c36bcab --- /dev/null +++ b/pkgs/applications/audio/sc68/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchsvn +, pkg-config +, which +, autoconf +, automake +, libtool +, hexdump +, libao +, zlib +, curl +}: + +stdenv.mkDerivation rec { + pname = "sc68"; + version = "unstable-2020-05-18"; + + src = fetchsvn { + url = "svn://svn.code.sf.net/p/sc68/code/"; + rev = "693"; + sha256 = "0liz5yjwiy41y160ag83zz9s5l8mk72fscxgvjv9g5qf4gwffnfa"; + }; + + preConfigure = "tools/svn-bootstrap.sh"; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkg-config which autoconf automake libtool hexdump ]; + + buildInputs = [ libao zlib curl ]; + + meta = with stdenv.lib; { + description = "Atari ST and Amiga music player"; + homepage = "http://sc68.atari.org/project.html"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index cf3f173a096e9..afb0276896021 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -5,13 +5,13 @@ let inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools; in buildPythonApplication rec { pname = "sonata"; - version = "1.7b1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "multani"; repo = "sonata"; rev = "v${version}"; - sha256 = "1npbxlrg6k154qybfd250nq2p96kxdsdkj9wwnp93gljnii3g8wh"; + sha256 = "0rl8w7s2asff626clzfvyz987l2k4ml5dg417mqp9v8a962q0v2x"; }; disabled = !isPy3k; diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/applications/audio/stochas/default.nix new file mode 100644 index 0000000000000..402d3f1b6fa2b --- /dev/null +++ b/pkgs/applications/audio/stochas/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libXrandr, libXinerama, libXext, libXcursor, freetype, alsaLib, libjack2 }: + +stdenv.mkDerivation rec { + pname = "stochas"; + version = "1.3.4"; + + src = fetchFromGitHub { + owner = "surge-synthesizer"; + repo = pname; + rev = "v${version}"; + sha256 = "0b26mbj727dnygavz4kihnhmnnvwsr9l145w6kydq7bd7nwiw7lq"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + libX11 libXrandr libXinerama libXext libXcursor freetype alsaLib libjack2 + ]; + + installPhase = '' + mkdir -p $out/lib/vst3 + cp -r stochas_artefacts/Release/VST3/Stochas.vst3 $out/lib/vst3 + ''; + + meta = with stdenv.lib; { + description = "Probabilistic polyrhythmic sequencer plugin"; + homepage = "https://stochas.org/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 4c64c595fefb7..bb2fc89339933 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.18.0"; + version = "2.19.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "19sx9n5mij68v07vy65h1c16rgbpll3kagr437cjb7r95k3nk2zn"; + sha256 = "13z4v64z58b8fxph3rgjqy1z1y2agmarfr8cihlkf0ndssicasdl"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index fb6753f79a50d..c25fd1b215102 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -4,6 +4,7 @@ , qtbase, qtdeclarative, qtgraphicaleffects , qtmultimedia, qtxmlpatterns , qtquickcontrols, qtquickcontrols2 +, qtmacextras , monero, miniupnpc, unbound, readline , boost, libunwind, libsodium, pcsclite , randomx, zeromq, libgcrypt, libgpgerror @@ -27,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.1.6"; + version = "0.17.1.7"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "0kn5wvx2psbdaqmy1cxlbf5l1mdpvh0b6hh9drah3s7nj3654a3r"; + sha256 = "1dd2ddkxh9ynxnscysl46hj4dm063h1v13fnyah69am26qzzbby4"; }; nativeBuildInputs = [ @@ -49,7 +50,8 @@ stdenv.mkDerivation rec { randomx libgcrypt libgpgerror boost libunwind libsodium pcsclite zeromq hidapi rapidjson - ] ++ optionals trezorSupport [ libusb1 protobuf python3 ]; + ] ++ optionals trezorSupport [ libusb1 protobuf python3 ] + ++ optionals stdenv.isDarwin [ qtmacextras ]; postUnpack = '' # copy monero sources here @@ -105,7 +107,6 @@ stdenv.mkDerivation rec { homepage = "https://getmonero.org/"; license = licenses.bsd3; platforms = platforms.all; - badPlatforms = platforms.darwin; maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 51dedba969bd1..3a254053714f2 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.1.6"; + version = "0.17.1.7"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "0b6zyr3mzqvcxf48i2g45gr649x6nhppik5598jsvg0z7i2hxb9q"; + sha256 = "1fdw4i4rw87yz3hz4yc1gdw0gr2mmf9038xaw2l4rrk5y50phjp4"; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 9cccbd7b7e46d..6a8bebf6178e2 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -1,39 +1,55 @@ -{ stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost17x -, zlib, gtest, gmock, callPackage, gmp, qt4, util-linux, protobuf, qrencode, libevent }: - -let librustzcash = callPackage ./librustzcash {}; -in -with stdenv.lib; -stdenv.mkDerivation rec { +{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper +, cargo, pkg-config +, bash, curl, coreutils, boost17x, db62, libsodium, libevent, utf8cpp, util-linux +}: +rustPlatform.buildRustPackage rec { pname = "zcash"; - version = "2.1.1-1"; + version = "4.1.1"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "1g5zlfzfp31my8w8nlg5fncpr2y95iv9fm04x57sjb93rgmjdh5n"; + sha256 = "185zrw276g545np0niw5hlhlppkjbf5a1r4rwhnbaimdjdii2dil"; }; - patchPhase = '' - sed -i"" 's,-fvisibility=hidden,,g' src/Makefile.am - ''; + cargoSha256 = "0qxr6asf8zsya0f1ri39z2cnfpjk96hgwjchz2c7j87vibbvg6dc"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gtest gmock gmp openssl wget db62 boost17x zlib - protobuf libevent libsodium librustzcash ] - ++ optionals stdenv.isLinux [ util-linux ]; + nativeBuildInputs = [ autoreconfHook cargo makeWrapper pkg-config ]; + buildInputs = [ bash boost17x db62 libevent libsodium utf8cpp ]; - configureFlags = [ "--with-boost-libdir=${boost17x.out}/lib" ]; + # Use the stdenv default phases (./configure; make) instead of the + # ones from buildRustPackage. + configurePhase = "configurePhase"; + buildPhase = "buildPhase"; + checkPhase = "checkPhase"; + installPhase = "installPhase"; - postInstall = '' - cp zcutil/fetch-params.sh $out/bin/zcash-fetch-params + postPatch = '' + # Have to do this here instead of in preConfigure because + # cargoDepsCopy gets unset after postPatch. + configureFlagsArray+=("RUST_VENDORED_SOURCES=$NIX_BUILD_TOP/$cargoDepsCopy") ''; + configureFlags = [ + "--disable-tests" + "--with-boost-libdir=${lib.getLib boost17x}/lib" + "CXXFLAGS=-I${lib.getDev utf8cpp}/include/utf8cpp" + "RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}" + ]; + enableParallelBuilding = true; - meta = { + # Requires hundreds of megabytes of zkSNARK parameters. + doCheck = false; + + postInstall = '' + wrapProgram $out/bin/zcash-fetch-params \ + --set PATH ${lib.makeBinPath [ coreutils curl util-linux ]} + ''; + + meta = with lib; { description = "Peer-to-peer, anonymous electronic cash system"; homepage = "https://z.cash/"; maintainers = with maintainers; [ rht tkerber ]; diff --git a/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix deleted file mode 100644 index 526adc715d45a..0000000000000 --- a/pkgs/applications/blockchains/zcash/librustzcash/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "librustzcash"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "zcash"; - repo = "librustzcash"; - rev = version; - sha256 = "0d28k29sgzrg9clynz29kpw50kbkp0a4dfdayqhmpjmsh05y6261"; - }; - - cargoSha256 = "1wzyrcmcbrna6rjzw19c4lq30didzk4w6fs6wmvxp0xfg4qqdlax"; - - installPhase = '' - mkdir -p $out/lib - cp $releaseDir/librustzcash.a $out/lib/ - mkdir -p $out/include - cp librustzcash/include/librustzcash.h $out/include/ - ''; - - # The tests do pass, but they take an extremely long time to run. - doCheck = false; - - meta = with stdenv.lib; { - description = "Rust-language assets for Zcash"; - homepage = "https://github.com/zcash/librustzcash"; - maintainers = with maintainers; [ rht tkerber ]; - license = with licenses; [ mit asl20 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 605d810b3d9c6..cbd156d78e0ee 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -1,4 +1,4 @@ -{ channel, pname, version, build, sha256Hash }: +{ channel, pname, version, build ? null, sha256Hash }: { alsaLib , bash @@ -53,11 +53,13 @@ let drvName = "android-studio-${channel}-${version}"; + filename = "android-studio-" + (if (build != null) then "ide-${build}" else version) + "-linux.tar.gz"; + androidStudio = stdenv.mkDerivation { name = "${drvName}-unwrapped"; src = fetchurl { - url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.tar.gz"; + url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/${filename}"; sha256 = sha256Hash; }; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index d94ad070536ae..d1eb7e58ef83d 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,14 +14,13 @@ let sha256Hash = "sha256-aAMhhJWcVFdvEZt8fI3tF12Eg3TzlU+kUFMNeCYN1os="; }; betaVersion = { - version = "4.2.0.17"; # "Android Studio 4.2 Beta 1" - build = "202.6987402"; - sha256Hash = "07qr0b1zdzpc1nsi6593518dxp89dcjfp4lznb1d3id8vbqla4i7"; + version = "4.2.0.18"; # "Android Studio 4.2 Beta 2" + build = "202.7008469"; + sha256Hash = "0323i4mcib84z7bsy801640gadd2k8ps7vr9jbdpb6i9gma6klmh"; }; latestVersion = { # canary & dev - version = "2020.3.1.2"; # "Android Studio Arctic Fox Canary 2" - build = "202.7006259"; - sha256Hash = "1d4brfx1fh1vlcjkb0x8hjj2qgz2dl5wbaiy8dj8w03vcf493nc5"; + version = "2020.3.1.3"; # "Android Studio Arctic Fox Canary 3" + sha256Hash = "1nx78j3pqr8qgwprnzfy17w9jmkgiqnlbsw91jnslr9p9fd0ixcx"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index af3f087dae263..bcdff1eff1fbf 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.115.0"; + version = "1.118.2"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "0q7gfpzc97fvyvabjdb9a4d3c2qhm4zf5bqgnsj73vkly80kgww8"; + sha256 = "0d6f4qfs7vifz7qkw2vkdjgd5w717wfpnxbc4qa4hs4g6y86ywmm"; }; patches = [ @@ -106,6 +106,7 @@ stdenv.mkDerivation rec { Search and replace with RegEx. Extendable by Python plugins and themes. ''; homepage = "http://www.uvviewsoft.com/cudatext/"; + changelog = "http://uvviewsoft.com/cudatext/history.txt"; license = licenses.mpl20; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 02418d25842dc..fc82ec4b8d150 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,18 +11,18 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2020.09.20", - "sha256": "09svn8yyqp6znvfpcxrsybkclh828h5rvah7nhbhk7nrfzj8i63x" + "rev": "2020.11.02", + "sha256": "0shihlm1hg74m04qyrj2iic2ik0x7qggihmnylvvdry3y79d07fy" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2020.10.12", - "sha256": "07vznwwfa3c1jr1cd32yppw0mmmm1ja9bmsxhxlcbnc2nb30n9zr" + "rev": "6560bc35a2cf31399be8713ac189216afabf9f01", + "sha256": "1bjnd6pcd9ddkvl7ma05z7f8svq609kljwc7gvbszc76hdb8d54x" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2020.10.11", - "sha256": "11vx685i85izp7wzb34dalcwlkmkbz1vzva5j9cf2yz1jff1v4qw" + "rev": "2459ea2a2e50050f7e6ee59a17a52aae05ca4433", + "sha256": "155cwcmr9f23j4x13pidvb3vcgglawkxxpizjw90ajwhmg831acr" }, "EControl": { "owner": "Alexey-T", @@ -36,8 +36,8 @@ }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2020.07.31", - "sha256": "0qbs51h6gw8qd3h06kwy1j7db35shbg7r2rayrhvvw0vzr9n330j" + "rev": "2020.10.23", + "sha256": "1lljldqnixlh0j05fh594gccwzkgcxa50byq8wr9ld5ik5sf8khn" }, "Emmet-Pascal": { "owner": "Alexey-T", @@ -51,7 +51,7 @@ }, "bgrabitmap": { "owner": "bgrabitmap", - "rev": "v11.2.4", - "sha256": "1zk88crfn07md16wg6af4i8nlx4ikkhxq9gfk49jirwimgwbf1md" + "rev": "v11.3.1", + "sha256": "1f95rdpfwqy9fipzybi17nbhq46zj45yjps21p2hplhinrr49n2p" } } diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 2c175f32d628c..586e2343cd3ef 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -12,13 +12,13 @@ assert stdenv ? glibc; # find the downloads needed for new versions # # to test: -# $ for e in cpp modeling platform sdk java committers; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done +# $ for e in cpp modeling platform sdk java committers rcp rust; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done let platform_major = "4"; - platform_minor = "17"; + platform_minor = "18"; year = "2020"; - month = "09"; + month = "12"; timestamp = "${year}${month}021800"; gtk = gtk3; in rec { @@ -37,7 +37,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "270pk7vvfvanig49xkrail01nf967zlp7xf8rvyh2ya7s0y0akj2bi0y4yms4gwijmingm8y2ir9qynd360mzwl8mnc1c31ykf9l3lh"; + sha512 = "MR6ddNmBKyXCyVGlGPfq6K2zJRywy4I5QDXji3rh81eJQ6zkEguo+VvD75i/szg/+FbCVA09vDVV06JgL4SHwQ=="; }; }; @@ -49,7 +49,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "26bb6cbnw94ml585aqrs8wpfksd2883njlqi48klpbn5n1bwpnpwvymx9q46i49piiyp0r1pa8ghdcgiwcakvri5nzldlh522fs7h5y"; + sha512 = "hSi3IL+fWhlUfEJYv4LFO7WNbZpiofAgNGZbEOIBS0VpeHfJ5Y6UKMKMLfQlG3hlkAL5jg/cEJKb/ad4DxHbjQ=="; }; }; @@ -61,7 +61,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "2i3gjxmq1i4p70q2l5749b96z1r4nv15dii17fywbyby3kbggwhfvaydizy7z5p6kn0y91dw13p7gmg3qpr9d46mb8f8h3sxks7fyl9"; + sha512 = "cPRa7ICogpcuwzOlzSSCEcWpwpUhQuIv6lGBKuAu9mOwj7Nz0TPaWVWNqN1541uVRXVTzcWX+mwc2UBPzWUPxg=="; }; }; @@ -86,7 +86,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "1c29r7qwjrjv86q2c4bhlrmmh50690lrq164jzrlisys9vnxb6wii0gwb34p9m1xqr3lgba1zhffb4jx18prrk0x8xbd78mp0lvya3k"; + sha512 = "iN6z5iSJ2bhE1IH3uJj7aiaF/nSIgIAqadvaTBpE4gkgLAXgtfraFAzgcw0zJr5m2u5mULfW45hLkmIXselniQ=="; }; }; @@ -98,7 +98,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "3rkpngrk6423i2pcf241wbr9jfzwxm2qwm57ipjpjw6705w1rapcws4bibqjznlf34lqvnynkw2wihy51j1ryw25z9fc2jsvyj67c1q"; + sha512 = "HVqsWUVNNRdcaziGdNI96R9F2VMUE4nYK1VX1G3pK+srFDlkJ7+rj2sZjtWL7WcJR1XSbT03nJJzPyp01RsCvQ=="; }; }; @@ -110,7 +110,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "3gnqamrn3x2gr4dfcgl7ppxpyi1q422l0sm7sh0vmipbs9l1c58plm3p14j9rjsyjlly2xjci6dg7sb9mj6259vc640wafnzcs89ii1"; + sha512 = "UtI4piLNRM3TsM9PzbGgsPqTkiurJ+7Q7jVra45an4YJHtfWcGTxxwUNnRzay6cHT49AjrWtVf1bovWSDXMiQA=="; }; }; @@ -122,7 +122,19 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "216g805fgpb7vwbgk36xkf467vijvaa3x0gk4d94pi92d9wdh5dph6wjjr4ka9rvg0pzxxr8y3sgbfqqzqpc82bgiz5qqr93sprh9bj"; + sha512 = "9DqNjSx1Ypdzpt1jIOJ9KFx8y+cG55K6bqkWTqnGjjDr4h4mWSzvGjHGUtFrKl92WRzQZKjNPxzVreDMcUkc/g=="; + }; + }; + + ### Eclipse IDE for Rust Developers + + eclipse-rust = buildEclipse { + name = "eclipse-rust-${platform_major}.${platform_minor}"; + description = "Eclipse IDE for Rust Developers"; + src = + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rust-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; + sha512 = "QbaG1knCMFnVQkPeApcIamJMXPyL8zUQa0ZsTJOuTgU/fD1RiHN7/WS6ax5azzIJhpjEtj2LMU4XV+MwkzResw=="; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 43ab2a796ebd7..04b8a1de159a2 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -255,12 +255,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; # find current version at https://www.eclipse.org/cdt/downloads.php - version = "10.0.1"; + version = "10.1.0"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.0/${name}/${name}.zip"; - sha256 = "1smi1yc4l627bb01zp0pcilm6d0hysxk440hy4n55gz3jxilygx5"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.1/${name}/${name}.zip"; + sha256 = "1hbswcar3a5cw20mwrj82w9pvpkvvj6jrvqqf1lincva0r5sl7h8"; }; meta = with stdenv.lib; { @@ -472,12 +472,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.17"; + version = "4.18"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202009021800/org.eclipse.jdt-${version}.zip"; - sha256 = "16vb88ywqfh0rix5krp2g39yhisv4i797g9c03aayzy5lynqm3ky"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202012021800/org.eclipse.jdt-${version}.zip"; + sha256 = "q0O6OE2u0bdz1+nOkzXDrrOOzoEbVaXnejx4lX7uZgk="; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index a84cb41bf30f5..101dbdaa2e943 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -42,7 +42,12 @@ assert withXwidgets -> withGTK3 && webkitgtk != null; let -in stdenv.mkDerivation { +in stdenv.mkDerivation (lib.optionalAttrs nativeComp { + NATIVE_FULL_AOT = "1"; + LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; +} // lib.optionalAttrs stdenv.isDarwin { + CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=101200"; +} // { inherit pname version patches; src = fetchurl { @@ -88,10 +93,6 @@ in stdenv.mkDerivation { "" ]; - CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=101200"; - - LIBRARY_PATH = if nativeComp then "${lib.getLib stdenv.cc.libc}/lib" else ""; - nativeBuildInputs = [ pkgconfig makeWrapper ] ++ lib.optionals srcRepo [ autoreconfHook texinfo ] ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; @@ -155,6 +156,11 @@ in stdenv.mkDerivation { mv nextstep/Emacs.app $out/Applications '' + lib.optionalString (nativeComp && withNS) '' ln -snf $out/lib/emacs/*/native-lisp $out/Applications/Emacs.app/Contents/native-lisp + '' + lib.optionalString nativeComp '' + mkdir -p $out/share/emacs/native-lisp + $out/bin/emacs --batch \ + --eval "(add-to-list 'comp-eln-load-path \"$out/share/emacs/native-lisp\")" \ + -f batch-native-compile $out/share/emacs/site-lisp/site-start.el ''; postFixup = lib.concatStringsSep "\n" [ @@ -195,4 +201,4 @@ in stdenv.mkDerivation { separately. ''; }; -} +}) diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el index 86cad1132f641..01a6422d731fa 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -34,6 +34,25 @@ least specific (the system profile)" (setenv "EMACSLOADPATH" (when new-env-list (mapconcat 'identity new-env-list ":")))))) +(let ((wrapper-site-lisp (getenv "emacsWithPackages_siteLispNative")) + (env-load-path (getenv "EMACSNATIVELOADPATH"))) + (when wrapper-site-lisp + (setenv "emacsWithPackages_siteLispNative" nil)) + (when (and wrapper-site-lisp env-load-path) + (let* ((env-list (split-string env-load-path ":")) + (new-env-list (delete wrapper-site-lisp env-list))) + (setenv "EMACSNATIVELOADPATH" (when new-env-list + (mapconcat 'identity new-env-list ":")))))) + +;;; Set up native-comp load path. +(when (featurep 'comp) + ;; Append native-comp subdirectories from `NIX_PROFILES'. + (setq comp-eln-load-path + (append (mapcar (lambda (profile-dir) + (concat profile-dir "/share/emacs/native-lisp/")) + (nix--profile-paths)) + comp-eln-load-path))) + ;;; Make `woman' find the man pages (defvar woman-manpath) (eval-after-load 'woman diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index d941c85e2c6f7..06013b50d63bd 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glow"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "glow"; rev = "v${version}"; - sha256 = "1jf9d8zwhvg9pc5g29lwz2r0lc59h1smwb5mjswxlvljpgbj7jwh"; + sha256 = "1y5cdqmyc2z2qk74l0r2c4mnw0jfibrf2ry7qcnmh96nhalq9m7j"; }; - vendorSha256 = "1p50qr7hbc8vyifa23z7xr43b4fpmwdzg7hqs503c124kpbpk45z"; + vendorSha256 = "11x6hshbqg1a39a1hwpfivgrhyk7ykw2aqylira3dqv039b1f639"; doCheck = false; @@ -20,6 +20,7 @@ buildGoModule rec { meta = with lib; { description = "Render markdown on the CLI, with pizzazz!"; homepage = "https://github.com/charmbracelet/glow"; + changelog = "https://github.com/charmbracelet/glow/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne penguwin ]; }; diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 07776bebe4258..43dbd137f784e 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf +{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText , coreutils, gnugrep, which, git, unzip, libsecret, libnotify +, vmopts ? null }: { name, product, version, src, wmClass, jdk, meta }: @@ -9,6 +10,11 @@ with stdenv.lib; let loName = toLower product; hiName = toUpper product; execName = concatStringsSep "-" (init (splitString "-" name)); + vmoptsName = loName + + ( if (with stdenv.hostPlatform; (is32bit || isDarwin)) + then "" + else "64" ) + + ".vmoptions"; in with stdenv; lib.makeOverridable mkDerivation rec { @@ -26,6 +32,8 @@ with stdenv; lib.makeOverridable mkDerivation rec { ''; }; + vmoptsFile = optionalString (vmopts != null) (writeText vmoptsName vmopts); + nativeBuildInputs = [ makeWrapper patchelf unzip ]; patchPhase = lib.optionalString (!stdenv.isDarwin) '' @@ -72,7 +80,8 @@ with stdenv; lib.makeOverridable mkDerivation rec { --set JDK_HOME "$jdk" \ --set ${hiName}_JDK "$jdk" \ --set ANDROID_JAVA_HOME "$jdk" \ - --set JAVA_HOME "$jdk" + --set JAVA_HOME "$jdk" \ + --set ${hiName}_VM_OPTIONS ${vmoptsFile} ln -s "$item/share/applications" $out/share ''; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 78e6ad30b7111..9638bea60c9a1 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -2,12 +2,13 @@ , python , jdk, cmake, libxml2, zlib, python3, ncurses5 , dotnet-sdk_3 +, vmopts ? null }: with stdenv.lib; let - mkJetBrainsProduct = callPackage ./common.nix { }; + mkJetBrainsProduct = callPackage ./common.nix { inherit vmopts; }; # Sorted alphabetically buildClion = { name, version, src, license, description, wmClass, ... }: @@ -48,7 +49,7 @@ let patchelf \ --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \ - bin/lldb/linux/lib/python3.*/lib-dynload/zlib.cpython-*m-x86_64-linux-gnu.so + bin/lldb/linux/lib/python3.*/lib-dynload/zlib.cpython-*-x86_64-linux-gnu.so patchelf \ --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python3 ]}:$lldbLibPath" \ @@ -268,12 +269,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.2.5"; /* updated by script */ + version = "2020.3"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0j7gxh8wqshn2i1f22bl9099sx8a4092qwkp4fwny4649rbkfyrz"; /* updated by script */ + sha256 = "0kqja2c5pz0f9idc52mv7iy2pqq2kfcx4q4x1ywfn3gq3d8n5j7z"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -294,12 +295,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.3"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "18mzlqibgc6lzwhbmyrni56464qhzla9mss27d45hv0mbv087jn0"; /* updated by script */ + sha256 = "0hj1xm3c71y2z1jyv7j3xf2lcj2y0kyvsxd3jjyyhs31w1f3394j"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -346,12 +347,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.2.4"; /* updated by script */ + version = "2020.3"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "111dr1a6695msh13cd484yk671jnh2ps6q1k2dl0kmryk9dqnvhd"; /* updated by script */ + sha256 = "1d5rx7p7lvjzgp57n980f2bfrj14p1f4hxmyvx5pzzd86q7hrcbq"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -359,12 +360,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.2.5"; /* updated by script */ + version = "2020.3"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0jkc26y3v94jj8q7dxq1py59is2whh45b890iac5adg6x670z3s6"; /* updated by script */ + sha256 = "1c2izsqx27g4jy46iskx5zg00pd8jaf9x1p0vya4l2v5r49dk4jb"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -372,12 +373,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.2.5"; /* updated by script */ + version = "2020.3"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "04imfgr45gvicjjgqzdcdmbnbiszjma3s40k2pgqs5nn6wbrw3dd"; /* updated by script */ + sha256 = "1kzgy90zcligwa9r6r11kx99z0zm93mrzy700y2jwslyzapd16d0"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index f1f8110665973..67a2ac5fac77c 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { export version="v${version}" ''; - doInstallCheckPhase = true; + doInstallCheck = true; installCheckPhase = '' - $out/bin/kak -ui json -E "kill 0" + $out/bin/kak -ui json -e "kill 0" ''; postInstall = '' diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index 524835402f4ef..23c8f0698cf07 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-php"; - version = "5.6.0"; + version = "5.6.1"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "1j5m9mhjzp2r4wdwnnnckms8ic536s6y0iyry2zdndbsy215hqlz"; + sha256 = "0xjijkmp3drnfrx4gb4bwf8n1dgwk310c0mssm6drffwix7ljpbz"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 9af12b386a0ba..041c25f1728c0 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-python"; - version = "5.6.0"; + version = "5.6.1"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "1bm6jk7gkl4vi579x99mja4znrzzp15zk66ss600dn8aq11jrxv2"; + sha256 = "1jma7j70imzxlyz8580m79jycif7zphga3zzfmqimn8syzz917hv"; }; cmakeFlags = [ diff --git a/pkgs/applications/editors/vscode/update-vscode.sh b/pkgs/applications/editors/vscode/update-vscode.sh index 4974eb7e43674..cb1400f048e09 100755 --- a/pkgs/applications/editors/vscode/update-vscode.sh +++ b/pkgs/applications/editors/vscode/update-vscode.sh @@ -27,3 +27,11 @@ sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODE_LINUX_SHA256}\"/" VSCODE_DARWIN_URL="https://vscode-update.azurewebsites.net/${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_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_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/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh index 0ddab6063cad9..79c6b497ecc68 100755 --- a/pkgs/applications/editors/vscode/update-vscodium.sh +++ b/pkgs/applications/editors/vscode/update-vscodium.sh @@ -19,10 +19,18 @@ fi VSCODIUM_VER=$(curl -Ls -w %{url_effective} -o /dev/null https://github.com/VSCodium/vscodium/releases/latest | awk -F'/' '{print $NF}') sed -i "s/version = \".*\"/version = \"${VSCODIUM_VER}\"/" "$ROOT/vscodium.nix" -VSCODIUM_LINUX_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz" -VSCODIUM_LINUX_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_URL}) -sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_SHA256}\"/" "$ROOT/vscodium.nix" +VSCODIUM_LINUX_X64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz" +VSCODIUM_LINUX_X64_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_X64_URL}) +sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_X64_SHA256}\"/" "$ROOT/vscodium.nix" -VSCODIUM_DARWIN_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-${VSCODIUM_VER}.zip" -VSCODIUM_DARWIN_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_URL}) -sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_SHA256}\"/" "$ROOT/vscodium.nix" +VSCODIUM_DARWIN_X64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-x64-${VSCODIUM_VER}.zip" +VSCODIUM_DARWIN_X64_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_X64_URL}) +sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_X64_SHA256}\"/" "$ROOT/vscodium.nix" + +VSCODIUM_LINUX_AARCH64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-arm64-${VSCODIUM_VER}.tar.gz" +VSCODIUM_LINUX_AARCH64_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_AARCH64_URL}) +sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODIUM_LINUX_AARCH64_SHA256}\"/" "$ROOT/vscodium.nix" + +VSCODIUM_LINUX_ARMV7L_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-armhf-${VSCODIUM_VER}.tar.gz" +VSCODIUM_LINUX_ARMV7L_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_ARMV7L_URL}) +sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODIUM_LINUX_ARMV7L_SHA256}\"/" "$ROOT/vscodium.nix" diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 70f621177105e..911b497e8f023 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -6,13 +6,17 @@ let plat = { x86_64-linux = "linux-x64"; x86_64-darwin = "darwin"; + aarch64-linux = "linux-arm64"; + armv7l-linux = "linux-armhf"; }.${system}; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0yv6584y4idkl9vvmpxj5ix5brshm1vadiwf7ima84snm0fipb0n"; - x86_64-darwin = "0igndxkwkxyjc9rkf9hbj8903hvfv7ab41q0s3gw8w5qh4b8s48x"; + x86_64-linux = "1kbjbqb03yapz7067q589gaa7d6cqaipj7hmp1l3nh0bmggzsc4c"; + x86_64-darwin = "1qgadm52c5lzkvgvqrz0n8brm4qbjg8hf1dk6a2ynqhqjxcwbj4r"; + aarch64-linux = "0i3yl9rx9h7qkl3k9qk6gg35nhz737qzzbvzvdwkqjaacsbpfgf8"; + armv7l-linux = "19iz2bxcq6y8sklr6zcnbp47kki9l00x3nvr213lkk3kj08l0afv"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +25,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.51.1"; + version = "1.52.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; @@ -52,6 +56,6 @@ in downloadPage = "https://code.visualstudio.com/Updates"; license = licenses.unfree; maintainers = with maintainers; [ eadwu synthetica ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index b8ca7e3f262e7..018cd710753cb 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -6,18 +6,24 @@ let plat = { x86_64-linux = "linux-x64"; x86_64-darwin = "darwin"; + aarch64-linux = "linux-arm64"; + armv7l-linux = "linux-armhf"; }.${system}; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0hn4pqmabz3qf3bbqnn1fz7fcgzdkp2lwr2yzgmx8hhh3cff8bnb"; - x86_64-darwin = "1x3wx0d99ihyya0n89qclc3jlhh0m72hs8hj7l0h3z6zmh6q2vzv"; + x86_64-linux = "1ckg279vvg8h1n8ippa9vlyw4vk3frinb6fvvi47zggs31168m7b"; + x86_64-darwin = "168g34v2b8r1pdbnqrs0c0k9aa60n5rspixziywnq7m61i23nlgd"; + aarch64-linux = "1cd4sg6k7sqmj3yzmprq1rz928bvc3zrch8agfd8zfap1d6nfaal"; + armv7l-linux = "0f8z4lws027dyqhcrkzm9rvifwid5m0icprg0xk01l7y18n3q923"; }.${system}; sourceRoot = { x86_64-linux = "."; x86_64-darwin = ""; + aarch64-linux = "."; + armv7l-linux = "."; }.${system}; in callPackage ./generic.nix rec { @@ -27,7 +33,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.51.1"; + version = "1.52.1"; pname = "vscodium"; executableName = "codium"; @@ -55,6 +61,6 @@ in downloadPage = "https://github.com/VSCodium/vscodium/releases"; license = licenses.mit; maintainers = with maintainers; [ synthetica turion ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 54d3d59875974..6f395640f5002 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -1,8 +1,9 @@ { mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, python3Packages, libspatialindex, libspatialite, postgresql , txt2tags, openssl, libzip, hdf5, netcdf, exiv2 -, qtbase, qtwebkit, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns +, qtbase, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns , withGrass ? true, grass +, withWebKit ? true, qtwebkit }: with lib; let @@ -10,7 +11,7 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in mkDerivation rec { - version = "3.10.11"; + version = "3.10.13"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +19,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "157hwi9sgnsf0csbfg4x3c7vh0zgf1hnqgn04lhg9xa1n8jjbv2q"; + sha256 = "0za77znk1phrxzy2cgxpwrld3d0pi0xvhsg78rg4wkb23vaqv6zb"; }; passthru = { @@ -28,8 +29,10 @@ in mkDerivation rec { buildInputs = [ openssl proj geos xlibsWrapper sqlite gsl qwt exiv2 fcgi libspatialindex libspatialite postgresql txt2tags libzip hdf5 netcdf - qtbase qtwebkit qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns] ++ - (lib.optional withGrass grass) ++ pythonBuildInputs; + qtbase qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns ] + ++ lib.optional withGrass grass + ++ lib.optional withWebKit qtwebkit + ++ pythonBuildInputs; nativeBuildInputs = [ cmake flex bison ninja ]; @@ -44,17 +47,15 @@ in mkDerivation rec { cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5" - "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" ] ++ - lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; + "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" ] + ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" + ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; meta = { description = "A Free and Open Source Geographic Information System"; - homepage = "http://www.qgis.org"; + homepage = "https://www.qgis.org"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ lsix ]; - # Our 3.10 LTS cannot use a newer Qt (5.15) version because it requires qtwebkit - # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b - broken = true; + maintainers = with lib.maintainers; [ lsix sikmir ]; }; } diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 71c2de08a5693..27d4a4ab0e2e5 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "3.2.1"; + version = "3.4.0"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "035rvqmw386hm0jpi14lf4dnpr5rjkalzjkyprqh42nwi3m86dkf"; + sha256 = "6dd3de1f5ea9f94af92838c0be5ff30fdaa599aa1d737dcb562f9e0b2b2dbdda"; }; nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index b201f9dbf0daf..d0c8d1c9ee941 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -66,7 +66,6 @@ mkDerivation rec { libGLU libGL libXt openmpi - (python3.withPackages (ps: with ps; [ numpy matplotlib mpi4py ])) tbb boost ffmpeg @@ -78,6 +77,10 @@ mkDerivation rec { qtsvg ]; + propagatedBuildInputs = [ + (python3.withPackages (ps: with ps; [ numpy matplotlib mpi4py ])) + ]; + meta = with stdenv.lib; { homepage = "https://www.paraview.org/"; description = "3D Data analysis and visualization application"; diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index da453b4267869..c21d0ed20545a 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -4,7 +4,7 @@ , cmake , gettext , wrapGAppsHook -, pkgconfig +, pkg-config , glib , gsettings-desktop-schemas @@ -22,16 +22,16 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.0.19"; + version = "1.0.20"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = version; - sha256 = "05nx4cmrka6hwdn7r91yy4h46qpa9k7iy9dkgaq3hrkh9z3fxlkq"; + sha256 = "1c7n03xm3m4lwcwxgplkn25i8c6s3i7rijbkcx86br1j4jadcs3k"; }; - nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ]; buildInputs = [ glib gsettings-desktop-schemas @@ -50,8 +50,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Xournal++ is a handwriting Notetaking software with PDF annotation support"; homepage = "https://xournalpp.github.io/"; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 315a5b3588554..1f0f7b5ace3f9 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -42,8 +42,8 @@ let libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; in mkDerivation (args // { - name = "${name}-${version}"; - inherit src; + pname = name; + inherit src version; outputs = args.outputs or [ "out" ]; diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix index 9a51aa786fac3..5a77cfec2f5a4 100644 --- a/pkgs/applications/kde/elisa.nix +++ b/pkgs/applications/kde/elisa.nix @@ -43,6 +43,6 @@ mkDerivation rec { description = "A simple media player for KDE"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; - broken = lib.versionOlder qtbase.version "5.14"; + broken = lib.versionOlder qtbase.version "5.15"; }; } diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix index 6204919a32858..92a0f1cde495e 100644 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -9,6 +9,7 @@ mkDerivation { meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; + broken = lib.versionOlder qtbase.version "5.13.0"; }; output = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix index 4523a69fc1be0..ac877d85228c9 100644 --- a/pkgs/applications/kde/kmime.nix +++ b/pkgs/applications/kde/kmime.nix @@ -13,4 +13,5 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcodecs ki18n qtbase ]; outputs = [ "out" "dev" ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix index bbaad3a02f83b..3a264e4025745 100644 --- a/pkgs/applications/kde/kompare.nix +++ b/pkgs/applications/kde/kompare.nix @@ -1,7 +1,8 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2 + kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2, + fetchpatch }: mkDerivation { @@ -11,5 +12,15 @@ mkDerivation { buildInputs = [ kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2 ]; + + patches = [ + (fetchpatch { + # Portaway from Obsolete methods of QPrinter + # Part of v20.12.0 + url = "https://invent.kde.org/sdk/kompare/-/commit/68d3eee36c48a2f44ccfd3f9e5a36311b829104b.patch"; + sha256 = "B2i5n5cUDjCqTEF0OyTb1+LhPa5yWCnFycwijf35kwU="; + }) + ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix index 4ede854d54602..6f79a46202bd0 100644 --- a/pkgs/applications/kde/kpimtextedit.nix +++ b/pkgs/applications/kde/kpimtextedit.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio, - kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools, + kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qtbase, qttools, qtspeech }: @@ -11,6 +11,7 @@ mkDerivation { meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; + broken = lib.versionOlder qtbase.version "5.13.0"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/applications/kde/kpkpass.nix b/pkgs/applications/kde/kpkpass.nix index 15dfe7f2e49e4..f31b37de9311c 100644 --- a/pkgs/applications/kde/kpkpass.nix +++ b/pkgs/applications/kde/kpkpass.nix @@ -8,7 +8,7 @@ mkDerivation { meta = { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; - broken = lib.versionOlder qtbase.version "5.13"; + broken = lib.versionOlder qtbase.version "5.15"; }; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ qtbase karchive ]; diff --git a/pkgs/applications/kde/libkgapi.nix b/pkgs/applications/kde/libkgapi.nix index 9d2d41c41d7f9..0e1d71d2745f2 100644 --- a/pkgs/applications/kde/libkgapi.nix +++ b/pkgs/applications/kde/libkgapi.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - qtwebengine, kio, kcalendarcore, kcontacts, + qtbase, qtwebengine, kio, kcalendarcore, kcontacts, cyrus_sasl }: @@ -10,6 +10,7 @@ mkDerivation { meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; + broken = lib.versionOlder qtbase.version "5.14.0"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ qtwebengine kio kcalendarcore kcontacts cyrus_sasl ]; diff --git a/pkgs/applications/kde/yakuake.nix b/pkgs/applications/kde/yakuake.nix index cb7f7070b24a1..f4f2c53522f01 100644 --- a/pkgs/applications/kde/yakuake.nix +++ b/pkgs/applications/kde/yakuake.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdoctools, extra-cmake-modules, karchive, kcrash, kdbusaddons, ki18n, kiconthemes, knewstuff, knotifications, - knotifyconfig, konsole, kparts, kwindowsystem, qtx11extras + knotifyconfig, konsole, kparts, kwayland, kwindowsystem, qtx11extras }: mkDerivation { @@ -9,7 +9,7 @@ mkDerivation { buildInputs = [ karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications - knotifyconfig kparts kwindowsystem qtx11extras + knotifyconfig kparts kwayland kwindowsystem qtx11extras ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index 09779f8876f8d..635cd9a991a62 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -5,25 +5,25 @@ watchdog, wtforms }: python3.pkgs.buildPythonApplication rec { pname = "archivy"; - version = "0.9.2"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "5cb760da57dc9dcdd62c0af824993d1715ec7035915629b4046d8bf50442756c"; + sha256 = "b6ff08a9ecd0a929663c36c73844ac5cb4dc847e69aae639a450c64d4320a506"; }; # Relax some dependencies postPatch = '' substituteInPlace requirements.txt \ - --replace 'validators ==' 'validators >=' \ - --replace 'elasticsearch ==' 'elasticsearch >=' \ - --replace 'python-dotenv ==' 'python-dotenv >=' \ - --replace 'beautifulsoup4 ==' 'beautifulsoup4 >=' \ --replace 'WTForms ==' 'WTForms >=' \ - --replace 'python_dotenv ==' 'python_dotenv >=' \ --replace 'attrs == 20.2.0' 'attrs' \ + --replace 'beautifulsoup4 ==' 'beautifulsoup4 >=' \ + --replace 'elasticsearch ==' 'elasticsearch >=' \ + --replace 'python_dotenv ==' 'python_dotenv >=' \ --replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \ - --replace 'requests ==' 'requests >=' + --replace 'requests ==' 'requests >=' \ + --replace 'validators ==' 'validators >=' \ + --replace 'watchdog ==' 'watchdog >=' ''; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 1cfc36d0c4c5c..8853ff266a6ac 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.9.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W95lMULucXcCDqSDWtRoXZM+zh8mmXhoEeFIukPFI0o="; + sha256 = "1xyh41vb2rypajjzbysw6k8x39bna8j3fmxcqyjcrqs0dzx78nk3"; }; vendorSha256 = "1il1vnv0v97qh8f47md5i6qaac2k8par0pd0z7zqg67vxq6gim85"; @@ -20,6 +20,17 @@ buildGoModule rec { -ldflags=-s -w -X github.com/tomwright/dasel/internal.Version=${version} ''; + doInstallCheck = true; + installCheckPhase = '' + if [[ "$("$out/bin/${pname}" --version)" == "${pname} version ${version}" ]]; then + echo "" | $out/bin/dasel put object -p yaml -t string -t int "my.favourites" colour=red number=3 | grep -q red + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + return 1 + fi + ''; + meta = with stdenv.lib; { description = "Query and update data structures from the command line"; longDescription = '' diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 3322fbee7127f..ac963c890dcfd 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -19,7 +19,7 @@ }: let - version = "4.0.7"; + version = "4.0.9"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -35,7 +35,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "06vcbj9p96d8v4xjlygzr74lqllb9adn8k0racajzq61ijb0imi2"; + sha256 = "0cmdyfabllw4wnpqpdxp3l6hjnm0cvkwxn0z8ph4x54sf4zq9iz3"; extraPostFetch = '' mv $out ./all @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0k5xf97ga3ixd02g1y6v84hbxd8yhvpj5iz2rhxs8wfnkfwibzh4"; + sha256 = "1fvjiagi78f32nxgr2rx8jas8hxfvpp1c8fpfcalvykmlhdc2gva"; }; postUnpack = '' diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index 1f2c275b13d11..707a7adb8a18b 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "geoipupdate"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "maxmind"; repo = "geoipupdate"; rev = "v${version}"; - sha256 = "0lhz7i4lprsik3s41y19vphsyc29vz6cbxikmvkmy6xjn40khjfr"; + sha256 = "1rzc8kidm8nr9pbcbq96kax3cbf39afrk5vzpl04lzpw3jbbakjq"; }; vendorSha256 = "1f858k8cl0dgiw124jv0p9jhi9aqxnc3nmc7hksw70fla2nzjrv0"; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index a081076ac83fa..5374a18b154ae 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.37"; + version = "8.0"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0fpb43smh0kwic5pdxs46c0hkqj8g084h72pa024x1my6w12y9b8"; + sha256 = "01ggakpzmiwkqdzc9xqc93xmynd53kzpwl99q3l9z2hpqyzlnj2a"; }; patches = (substituteAll { @@ -37,7 +37,7 @@ mkDerivation rec { ''; homepage = "https://www.gpxsee.org/"; changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ womfoo sikmir ]; platforms = with platforms; linux ++ darwin; }; diff --git a/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff b/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff index 3b546338d209d..757d9b8c65714 100644 --- a/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff +++ b/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff @@ -1,18 +1,18 @@ diff --git i/src/GUI/app.cpp w/src/GUI/app.cpp -index 10e84d5..1e0abbe 100644 +index 37e9d3f..d4a065c 100644 --- i/src/GUI/app.cpp +++ w/src/GUI/app.cpp -@@ -34,11 +34,10 @@ App::App(int &argc, char **argv) : QApplication(argc, argv) - installTranslator(gpxsee); +@@ -35,11 +35,10 @@ App::App(int &argc, char **argv) : QApplication(argc, argv) + installTranslator(gpxsee); QTranslator *qt = new QTranslator(this); -#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) +#if defined(Q_OS_WIN32) - qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir()); + if (qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir())) #else // Q_OS_WIN32 || Q_OS_MAC -- qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location( -- QLibraryInfo::TranslationsPath)); -+ qt->load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations")); +- if (qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location( +- QLibraryInfo::TranslationsPath))) ++ if (qt->load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations"))) #endif // Q_OS_WIN32 || Q_OS_MAC - installTranslator(qt); + installTranslator(qt); diff --git a/pkgs/applications/misc/keystore-explorer/default.nix b/pkgs/applications/misc/keystore-explorer/default.nix new file mode 100644 index 0000000000000..613b96d1731c6 --- /dev/null +++ b/pkgs/applications/misc/keystore-explorer/default.nix @@ -0,0 +1,40 @@ +{ fetchzip, stdenv, jdk8, runtimeShell }: + +stdenv.mkDerivation rec { + version = "5.4.4"; + pname = "keystore-explorer"; + src = fetchzip { + url = "https://github.com/kaikramer/keystore-explorer/releases/download/v${version}/kse-544.zip"; + sha256 = "01kpa8g6p6vcqq9y70w5bm8jbw4kp55pbywj2zrhgjibrhgjqi0b"; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/share/keystore-explorer + cp -R icons licenses lib kse.jar $out/share/keystore-explorer/ + + # keystore-explorer's kse.sh tries to detect the path of Java by using + # Python on Darwin; just write our own start script to avoid unnecessary dependencies + cat > $out/bin/keystore-explorer <<EOF + #!${runtimeShell} + export JAVA_HOME=${jdk8.home} + exec ${jdk8}/bin/java -jar $out/share/keystore-explorer/kse.jar "\$@" + EOF + chmod +x $out/bin/keystore-explorer + + runHook postInstall + ''; + + dontStrip = true; + dontBuild = true; + dontConfigure = true; + + meta = { + description = "Open source GUI replacement for the Java command-line utilities keytool and jarsigner"; + license = stdenv.lib.licenses.gpl3Only; + maintainers = [ stdenv.lib.maintainers.numinit ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index 4ffd3f6fbf650..e870986a50aa7 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -11,12 +11,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2020.11"; + version = "2020.12"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "15nw8kyjyhqlr742gkpzn1b9906rdm6cssnc6jbbph5pjdlzspc4"; + sha256 = "0x97mm7h8kr1jps0hzdgl9irakma85ikrhzr18wc1plmffgv6kwm"; }; sourceRoot = "."; @@ -47,6 +47,6 @@ in stdenv.mkDerivation rec { "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; platforms = intersectLists platforms.x86_64 platforms.linux; license = licenses.agpl3; - maintainers = [ maintainers.contrun ]; + maintainers = with maintainers; [ contrun neonfuz]; }; } diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 0df0f86ef4568..6f7967dfdfd53 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,5 +1,6 @@ { boost , fetchFromGitHub +, fetchpatch , installShellFiles , mkDerivationWith , muparser @@ -16,7 +17,7 @@ let stdenv = gcc8Stdenv; in -# Doesn't build with gcc9 + # Doesn't build with gcc9 mkDerivationWith stdenv.mkDerivation rec { pname = "librecad"; version = "2.2.0-rc1"; @@ -30,6 +31,13 @@ mkDerivationWith stdenv.mkDerivation rec { patches = [ ./fix_qt_5_11_build.patch + ( + fetchpatch { + # Fix missing app name and icon on Wayland. + url = "https://github.com/LibreCAD/LibreCAD/commit/a17f8281093403f0c7c36996232665ed21906688.patch"; + sha256 = "1x46psh4bcx2hxck4l83ki43g1252vb033i2x94h4rpai9hww4d5"; + } + ) ]; postPatch = '' diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix index 41ae683548d08..48e2a3960ee76 100644 --- a/pkgs/applications/misc/mapproxy/default.nix +++ b/pkgs/applications/misc/mapproxy/default.nix @@ -1,38 +1,15 @@ { lib , pkgs -, python +, python3 }: -let - py = python.override { - packageOverrides = self: super: { - pyproj = super.pyproj.overridePythonAttrs (oldAttrs: rec { - version = "1.9.6"; - src = pkgs.fetchFromGitHub { - owner = "pyproj4"; - repo = "pyproj"; - rev = "v${version}rel"; - sha256 = "18v4h7jx4mcc0x2xy8y7dfjq9bzsyxs8hdb6v67cabvlz2njziqy"; - }; - nativeBuildInputs = with python.pkgs; [ cython ]; - patches = [ ]; - checkPhase = '' - runHook preCheck - pushd unittest # changing directory should ensure we're importing the global pyproj - ${python.interpreter} test.py && ${python.interpreter} -c "import doctest, pyproj, sys; sys.exit(doctest.testmod(pyproj)[0])" - popd - runHook postCheck - ''; - }); - }; - }; -in -with py.pkgs; + +with python3.pkgs; buildPythonApplication rec { pname = "MapProxy"; - version = "1.12.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "622e3a7796ef861ba21e42231b49c18d00d75f03eaf3f01a2b7687be7568e2ec"; + sha256 = "0qi63ap8yi5g2cas33jv4jsmdrl6yv3qp6bh0zxrfpkb704lcng4"; }; prePatch = '' substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix new file mode 100644 index 0000000000000..c4ed0c975eabd --- /dev/null +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, mkDerivation +, fetchFromGitHub +, qmake +, curl +, ffmpeg +, libmediainfo +, libzen +, qtbase +, qtdeclarative +, qtmultimedia +}: + +mkDerivation rec { + pname = "mediaelch"; + version = "2.8.2"; + + src = fetchFromGitHub { + owner = "Komet"; + repo = "MediaElch"; + rev = "v${version}"; + sha256 = "0y26vfgrdym461lzmm5x3z5ai9ky09vlk3cy4sq6hwlj7mzcz0k7"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ qmake ]; + + buildInputs = [ curl libmediainfo libzen ffmpeg qtbase qtdeclarative qtmultimedia ]; + + prePatch = '' + substituteInPlace MediaElch.pro --replace "/usr" "$out" + ''; + + meta = with stdenv.lib; { + homepage = "https://mediaelch.de/mediaelch/"; + description = "Media Manager for Kodi"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ stunkymonkey ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index bc825b94facba..804ba33209afb 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.44.17"; + version = "0.44.21"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "1bqp99n8cqr7kjiffbs39v0dd280f50hid5py3c4zgc7aqj9k0bx"; + sha256 = "1m3iy2v8mimyb25xisr7i4ga6qlggv1i2aji9qfgagns7ffp53nf"; }; outputs = [ "out" "udev" ]; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index b6fd295ba82f0..b33c091a581ad 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.9.20"; + version = "0.9.22"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "19yhmqaz5mynl879q38g338q4w8mwx75fnl25bhwrvy7yy3aa23l"; + sha256 = "kIqNptt5fl3YORQ7iDqQ5d6Exu+P/nAvVCVgXMRQvpQ="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 377f00d1c166a..e438fd0762fab 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.38.1"; + version = "3.38.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sqmq9xhcm3rc3mbhj1bdn55bkpzbk72xhmgka75syxh77gzz0ld"; + sha256 = "UAX/LhHdH3E/WswZA6JwEZvFjDD9uMn4K8rHFJfGwjw="; }; patches = [ diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index df08de7a4a224..940cd1cdc9191 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -27,13 +27,13 @@ assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { pname = "polybar"; - version = "3.5.0"; + version = "3.5.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1kga98cgllsjcq692l27y01sgl8ii4wxp70kmdcwxkrliylg3dji"; + sha256 = "1ir8fdnzrba9fkkjfvax5szx5h49lavwgl9pabjzrpbvif328g3x"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index 46378aec33aed..9080bec753de8 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, makeWrapper, perl, ncurses5, taskwarrior }: stdenv.mkDerivation rec { - version = "2017-05-15"; + version = "2020-12-17"; pname = "tasknc"; src = fetchFromGitHub { owner = "lharding"; repo = "tasknc"; - rev = "c41d0240e9b848e432f01de735f28de93b934ae7"; - sha256 = "0f7l7fy06p33vw6f6sjnjxfhw951664pmwhjl573jvmh6gi2h1yr"; + rev = "a182661fbcc097a933d5e8cce3922eb1734a563e"; + sha256 = "0jrv2k1yizfdjndbl06lmy2bb62ky2rjdk308967j31c5kqqnw56"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/terminal-typeracer/default.nix b/pkgs/applications/misc/terminal-typeracer/default.nix new file mode 100644 index 0000000000000..fa68703e8c0f9 --- /dev/null +++ b/pkgs/applications/misc/terminal-typeracer/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchFromGitLab +, rustPlatform +, pkg-config +, openssl +, sqlite +, libiconv +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "terminal-typeracer"; + version = "2.0.2"; + + src = fetchFromGitLab { + owner = "ttyperacer"; + repo = pname; + rev = "v${version}"; + sha256 = "187xrqxalk2gxa22ki5q092llvliddrsc68cg4dvvy2xzq254jfy"; + }; + + cargoSha256 = "0ky8m23fjjbv7fr9776fjczpg0d43jxwnjxjpwz56jpynwnihfkl"; + + buildInputs = [ openssl sqlite ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + nativeBuildInputs = [ pkg-config ]; + + meta = with stdenv.lib; { + description = "An open source terminal based version of Typeracer written in rust"; + homepage = "https://gitlab.com/ttyperacer/terminal-typeracer"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ yoctocell ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix new file mode 100644 index 0000000000000..a9fcb969f675e --- /dev/null +++ b/pkgs/applications/misc/tty-share/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +# Upstream has a `./vendor` directory with all deps which we rely upon. +buildGoPackage rec { + pname = "tty-share"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "elisescu"; + repo = "tty-share"; + rev = "v${version}"; + sha256 = "1d2vd3d1lb4n0jq4s0p5mii1vz4r3z36hykr5mnx53srsni1wsj5"; + }; + + goPackagePath = "github.com/elisescu/tty-share"; + + meta = with stdenv.lib; { + homepage = "https://tty-share.com"; + description = "Share terminal via browser for remote work or shared sessions"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ andys8 ]; + }; +} diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index f1439dc7d161c..d2522360a7532 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -20,13 +20,13 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; - version = "5.8.0"; + version = "5.9.0"; disabled = python3Packages.isPy27; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "1czxzcxix9iwv1sir1q64j5aavc7lzjjwqpisgdc1kidkwnk05zp"; + sha256 = "sha256-jRCrkJcjUHDd3wF+Hkxg0QaW7YgIh7zM/KZ4TAH84/U="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 5d4247f3869d9..18c2bc129ccc0 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.4.7.1"; + version = "5.4.9.6"; src = fetchurl { - url = "https://updates-desktopapp.upwork.com/binaries/v5_4_7_1_81f361962c74427d/${pname}_5.4.7.1_amd64.deb"; - sha256 = "c443724d37bca942ca126b8b207846a5adb94a92ff9490370f2fe055feee347b"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_4_9_6_2565cdd0547940a2/${pname}_${version}_amd64.deb"; + sha256 = "ff6246b3b4a1ed79cc9bca2934652fefb40bdac4b7e95997f3a46e354ce52456"; }; dontWrapGApps = true; diff --git a/pkgs/applications/misc/xdg-launch/default.nix b/pkgs/applications/misc/xdg-launch/default.nix new file mode 100644 index 0000000000000..257b15387baa3 --- /dev/null +++ b/pkgs/applications/misc/xdg-launch/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoconf +, automake +, gettext +, libtool +, perl +, pkg-config +, glib +, xorg +}: +stdenv.mkDerivation rec { + pname = "xdg-launch"; + version = "1.10"; + + postPatch = '' + # fix gettext configuration + echo 'AM_GNU_GETTEXT_VERSION' >> configure.ac + echo 'AM_GNU_GETTEXT([external])' >> configure.ac + + sed -i data/*.desktop \ + -e "s,/usr/bin,/$out/bin,g" + ''; + + src = fetchFromGitHub { + owner = "bbidulock"; + repo = pname; + rev = version; + sha256 = "sha256-WY1TAPnXAn5GOaP9aMHar761m1MkKm4vavLlWELWUu8="; + }; + + preConfigure = "./autogen.sh"; + + buildInputs = [ + xorg.libX11 + xorg.libXrandr + glib # can be optional + ]; + + nativeBuildInputs = [ + autoconf + automake + gettext + libtool + perl # pod2man + pkg-config + ]; + + meta = with lib; { + homepage = "https://github.com/bbidulock/xdg-launch"; + description = "A command line XDG compliant launcher and tools"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.ck3d ]; + }; +} diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index d76dd8b9daa7a..c1926820ece19 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -70,7 +70,6 @@ rpath = lib.makeLibraryPath [ libXext libXfixes libXi - libxkbcommon libXrandr libXrender libXtst @@ -89,11 +88,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.17.73"; + version = "1.18.75"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "18bd6kgzfza5r0y2ggfy82pdpnfr2hzgjcfy9vxqq658z7q3jpqy"; + sha256 = "1njgdw7ml30xs517brc7z7piy6lcylrfjhz6wn1dp7gywsxfgx1h"; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index d3953da71d284..b9a42e825f31c 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -1,4 +1,4 @@ -{ stdenv, mkChromiumDerivation, channel, enableWideVine }: +{ stdenv, mkChromiumDerivation, channel, enableWideVine, ungoogled }: with stdenv.lib; @@ -69,18 +69,25 @@ mkChromiumDerivation (base: rec { requiredSystemFeatures = [ "big-parallel" ]; meta = { - description = "An open source web browser from Google"; + description = "An open source web browser from Google" + + optionalString ungoogled ", with dependencies on Google web services removed"; longDescription = '' Chromium is an open source web browser from Google that aims to build a safer, faster, and more stable way for all Internet users to experience the web. It has a minimalist user interface and provides the vast majority of source code for Google Chrome (which has some additional features). ''; - homepage = "https://www.chromium.org/"; - maintainers = with maintainers; [ primeos thefloweringash bendlas ]; # See README.md + homepage = if ungoogled + then "https://github.com/Eloston/ungoogled-chromium" + else "https://www.chromium.org/"; + maintainers = with maintainers; if ungoogled + then [ squalus primeos ] + else [ primeos thefloweringash bendlas ]; license = if enableWideVine then licenses.unfree else licenses.bsd3; platforms = platforms.linux; - hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; + hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium") + then ["aarch64-linux" "x86_64-linux"] + else []; timeout = 172800; # 48 hours (increased from the Hydra default of 10h) }; }) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 0c16d0c9ec60c..d7b1a017d31dd 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -13,7 +13,7 @@ , bison, gperf , glib, gtk3, dbus-glib , glibc -, libXScrnSaver, libXcursor, libXtst, libGLU, libGL +, libXScrnSaver, libXcursor, libXtst, libxshmfence, libGLU, libGL , protobuf, speechd, libXdamage, cups , ffmpeg, libxslt, libxml2, at-spi2-core , jre8 @@ -31,6 +31,7 @@ , proprietaryCodecs ? true , cupsSupport ? true , pulseSupport ? false, libpulseaudio ? null +, ungoogled ? false, ungoogled-chromium , channel , upstream-info @@ -109,6 +110,10 @@ let result else result; + ungoogler = ungoogled-chromium { + inherit (upstream-info.deps.ungoogled-patches) rev sha256; + }; + base = rec { name = "${packageName}-unwrapped-${version}"; inherit (upstream-info) version; @@ -131,7 +136,7 @@ let util-linux alsaLib bison gperf kerberos glib gtk3 dbus-glib - libXScrnSaver libXcursor libXtst libGLU libGL + libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL pciutils protobuf speechd libXdamage at-spi2-core jre pipewire_0_2 @@ -208,6 +213,10 @@ let '' + optionalString stdenv.isAarch64 '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' + '' + optionalString ungoogled '' + ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors" + ${ungoogler}/utils/patches.py . ${ungoogler}/patches + ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz . ''; gnFlags = mkGnFlags ({ @@ -260,6 +269,24 @@ let use_system_minigbm = true; use_system_libdrm = true; system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; + } // optionalAttrs ungoogled { + chrome_pgo_phase = 0; + enable_hangout_services_extension = false; + enable_js_type_check = false; + enable_mdns = false; + enable_nacl_nonsfi = false; + enable_one_click_signin = false; + enable_reading_list = false; + enable_remoting = false; + enable_reporting = false; + enable_service_discovery = false; + exclude_unwind_tables = true; + google_api_key = ""; + google_default_client_id = ""; + google_default_client_secret = ""; + safe_browsing_mode = 0; + use_official_google_api_keys = false; + use_unofficial_version_number = false; } // (extraAttrs.gnFlags or {})); configurePhase = '' diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index e35e4d945dde2..fd89f3160084a 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -15,6 +15,7 @@ , enablePepperFlash ? false , enableWideVine ? false , enableVaapi ? false # Disabled by default due to unofficial support +, ungoogled ? false # Whether to build chromium or ungoogled-chromium , cupsSupport ? true , pulseSupport ? config.pulseaudio or stdenv.isLinux , commandLineArgs ? "" @@ -33,7 +34,7 @@ let mkChromiumDerivation = callPackage ./common.nix ({ inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs - cupsSupport pulseSupport; + cupsSupport pulseSupport ungoogled; gnChromium = gn.overrideAttrs (oldAttrs: { inherit (upstream-info.deps.gn) version; src = fetchgit { @@ -42,14 +43,17 @@ let }); }); - browser = callPackage ./browser.nix { inherit channel enableWideVine; }; + browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; }; plugins = callPackage ./plugins.nix { inherit enablePepperFlash; }; + + ungoogled-chromium = callPackage ./ungoogled.nix {}; }; - pkgSuffix = if channel == "dev" then "unstable" else channel; + pkgSuffix = if channel == "dev" then "unstable" else + (if channel == "ungoogled-chromium" then "stable" else channel); pkgName = "google-chrome-${pkgSuffix}"; chromeSrc = fetchurl { urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ @@ -71,7 +75,7 @@ let unpackCmd = let widevineCdmPath = - if channel == "stable" then + if (channel == "stable" || channel == "ungoogled-chromium") then "./opt/google/chrome/WidevineCdm" else if channel == "beta" then "./opt/google/chrome-beta/WidevineCdm" @@ -113,7 +117,9 @@ let }; }; - suffix = if channel != "stable" then "-" + channel else ""; + suffix = if (channel == "stable" || channel == "ungoogled-chromium") + then "" + else "-" + channel; sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName; @@ -133,7 +139,8 @@ let else browser; in stdenv.mkDerivation { - name = "chromium${suffix}-${version}"; + name = lib.optionalString ungoogled "ungoogled-" + + "chromium${suffix}-${version}"; inherit version; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix b/pkgs/applications/networking/browsers/chromium/ungoogled.nix index 17418c90af490..299b19f2f4f67 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix +++ b/pkgs/applications/networking/browsers/chromium/ungoogled.nix @@ -4,6 +4,7 @@ , makeWrapper , patch }: + { rev , sha256 }: diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index 9e1f0aec598da..2b9f9232c24d6 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -1,6 +1,9 @@ #! /usr/bin/env nix-shell #! nix-shell -i python -p python3 nix nix-prefetch-git +"""This script automatically updates chromium, google-chrome, chromedriver, and ungoogled-chromium +via upstream-info.json.""" + import csv import json import re @@ -19,41 +22,54 @@ BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json' + def load_json(path): + """Loads the given JSON file.""" with open(path, 'r') as f: return json.load(f) + def nix_prefetch_url(url, algo='sha256'): + """Prefetches the content of the given URL.""" print(f'nix-prefetch-url {url}') out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url]) return out.decode('utf-8').rstrip() + def nix_prefetch_git(url, rev): + """Prefetches the requested Git revision of the given repository URL.""" print(f'nix-prefetch-git {url} {rev}') out = subprocess.check_output(['nix-prefetch-git', '--quiet', '--url', url, '--rev', rev]) return json.loads(out) + def get_file_revision(revision, file_path): + """Fetches the requested Git revision of the given Chromium file.""" url = f'https://raw.githubusercontent.com/chromium/chromium/{revision}/{file_path}' with urlopen(url) as http_response: return http_response.read() + def get_matching_chromedriver(version): + """Gets the matching chromedriver version for the given Chromium version.""" # See https://chromedriver.chromium.org/downloads/version-selection build = re.sub('.[0-9]+$', '', version) chromedriver_version_url = f'https://chromedriver.storage.googleapis.com/LATEST_RELEASE_{build}' with urlopen(chromedriver_version_url) as http_response: chromedriver_version = http_response.read().decode() def get_chromedriver_url(system): - return f'https://chromedriver.storage.googleapis.com/{chromedriver_version}/chromedriver_{system}.zip' + return ('https://chromedriver.storage.googleapis.com/' + + f'{chromedriver_version}/chromedriver_{system}.zip') return { 'version': chromedriver_version, 'sha256_linux': nix_prefetch_url(get_chromedriver_url('linux64')), 'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac64')) } -def get_channel_dependencies(channel): - deps = get_file_revision(channel['version'], 'DEPS') + +def get_channel_dependencies(version): + """Gets all dependencies for the given Chromium version.""" + deps = get_file_revision(version, 'DEPS') gn_pattern = b"'gn_version': 'git_revision:([0-9a-f]{40})'" gn_commit = re.search(gn_pattern, deps).group(1).decode() gn = nix_prefetch_git('https://gn.googlesource.com/gn', gn_commit) @@ -66,12 +82,35 @@ def get_channel_dependencies(channel): } } + +def get_latest_ungoogled_chromium_tag(): + """Returns the latest ungoogled-chromium tag using the GitHub API.""" + api_tag_url = 'https://api.github.com/repos/Eloston/ungoogled-chromium/tags?per_page=1' + with urlopen(api_tag_url) as http_response: + tag_data = json.load(http_response) + return tag_data[0]['name'] + + +def get_latest_ungoogled_chromium_build(): + """Returns a dictionary for the latest ungoogled-chromium build.""" + tag = get_latest_ungoogled_chromium_tag() + version = tag.split('-')[0] + return { + 'channel': 'ungoogled-chromium', + 'version': version, + 'ungoogled_tag': tag + } + + channels = {} last_channels = load_json(JSON_PATH) + print(f'GET {HISTORY_URL}', file=sys.stderr) with urlopen(HISTORY_URL) as resp: builds = csv.DictReader(iterdecode(resp, 'utf-8')) + builds = list(builds) + builds.append(get_latest_ungoogled_chromium_build()) for build in builds: channel_name = build['channel'] @@ -88,34 +127,50 @@ with urlopen(HISTORY_URL) as resp: continue channel = {'version': build['version']} - suffix = 'unstable' if channel_name == 'dev' else channel_name + if channel_name == 'dev': + google_chrome_suffix = 'unstable' + elif channel_name == 'ungoogled-chromium': + google_chrome_suffix = 'stable' + else: + google_chrome_suffix = channel_name try: channel['sha256'] = nix_prefetch_url(f'{BUCKET_URL}/chromium-{build["version"]}.tar.xz') - channel['sha256bin64'] = nix_prefetch_url(f'{DEB_URL}/google-chrome-{suffix}/google-chrome-{suffix}_{build["version"]}-1_amd64.deb') + channel['sha256bin64'] = nix_prefetch_url( + f'{DEB_URL}/google-chrome-{google_chrome_suffix}/' + + f'google-chrome-{google_chrome_suffix}_{build["version"]}-1_amd64.deb') except subprocess.CalledProcessError: # This build isn't actually available yet. Continue to # the next one. continue - channel['deps'] = get_channel_dependencies(channel) + channel['deps'] = get_channel_dependencies(channel['version']) if channel_name == 'stable': channel['chromedriver'] = get_matching_chromedriver(channel['version']) + elif channel_name == 'ungoogled-chromium': + ungoogled_repo_url = 'https://github.com/Eloston/ungoogled-chromium.git' + channel['deps']['ungoogled-patches'] = { + 'rev': build['ungoogled_tag'], + 'sha256': nix_prefetch_git(ungoogled_repo_url, build['ungoogled_tag'])['sha256'] + } channels[channel_name] = channel + with open(JSON_PATH, 'w') as out: def get_channel_key(item): + """Orders Chromium channels by their name.""" channel_name = item[0] if channel_name == 'stable': return 0 - elif channel_name == 'beta': + if channel_name == 'beta': return 1 - elif channel_name == 'dev': + if channel_name == 'dev': return 2 - else: - print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr) - sys.exit(1) + if channel_name == 'ungoogled-chromium': + return 3 + print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr) + sys.exit(1) sorted_channels = OrderedDict(sorted(channels.items(), key=get_channel_key)) json.dump(sorted_channels, out, indent=2) out.write('\n') diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 3b64e601eba64..5be89852b3894 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": "88.0.4324.41", - "sha256": "06hnawylr7fl1zav6cyg1yfw2z04qrpnj4n3v07qx7ya6p8qyp2g", - "sha256bin64": "1iq4qd5x7ivypcxh47d6av45hyqdgga2s80idyhf1f51f660h2vc", + "version": "88.0.4324.50", + "sha256": "17v0qp05785xc4whsbw6fmf0x5ccjx2mk6n4qy6z2mx2yjjjfv8q", + "sha256bin64": "01cphbd56l7g3cdmrvwynkzrpx9h3v7pz6ac76sxlp6irjzhbnva", "deps": { "gn": { "version": "2020-11-05", @@ -31,9 +31,9 @@ } }, "dev": { - "version": "89.0.4350.4", - "sha256": "1jh3r227j70imjzj0gm7cf1mv25zcdd2waa9qvim0p3g6wbdacmq", - "sha256bin64": "06963r7a1xc9vjlwgn0wgzqfj6mavfks20lzf49axw6izrxf8sbr", + "version": "89.0.4356.6", + "sha256": "1jq0wbaaz07kz2190rq3vl2b5spx3qfda4al9ygkm8man817d2nr", + "sha256bin64": "0dgvp2my328s4ah0hmp1hg1c3x21gkrz9mjvbfs54r2pjb7y5sbl", "deps": { "gn": { "version": "2020-11-05", @@ -42,5 +42,22 @@ "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" } } + }, + "ungoogled-chromium": { + "version": "87.0.4280.88", + "sha256": "1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy", + "sha256bin64": "0n3fm6wf8zfkv135d50xl8xxrnng3q55vyxkck1da8jyvh18bijb", + "deps": { + "gn": { + "version": "2020-09-09", + "url": "https://gn.googlesource.com/gn", + "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", + "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" + }, + "ungoogled-patches": { + "rev": "87.0.4280.88-1", + "sha256": "0w2137w8hfcgl6f938hqnb4ffp33v5r8vdzxrvs814w7dszkiqgg" + } + } } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 98cf28ec3e184..9bf5e837bf5d2 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "84.0b4"; + version = "85.0b4"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ach/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ach/firefox-85.0b4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "da9290899d245d86b3d2d378072af403106596ae1e02a36d40a93deea9e57000"; + sha256 = "04d5c5b64e906438122cfcd13c6a06d58bb1c0a2d2eaf66f52f91e103a5534ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/af/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/af/firefox-85.0b4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "28810946bde4c2335714c0f8b0dffad1a1650c167370e38c6eb5e2ee5d2e54be"; + sha256 = "57bdfd3e6efe3c667ddb4c1e2421c191eedc407f578ee307b1ed916815726837"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/an/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/an/firefox-85.0b4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "d32e9e13b2c1f484686d9394f20a87e2c1d833703e0115de1f9c8c552d1e9d8a"; + sha256 = "7ceb815590071691a3faa6f1d8215963b48c54c220c512499fb9642efc1492d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ar/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ar/firefox-85.0b4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "de8348caf98ca0551f3f080eb32ef94c00706676bc8df1723377d98f10221e56"; + sha256 = "ce8b25f9ba3d21e87f660a17a90e770417e658f7280d0e41d0a5ff41164a2d43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ast/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ast/firefox-85.0b4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "104cc96b0e14c030848be4bc07a1b2b836a241e9ddba581b9ca24018c54356ee"; + sha256 = "a220440bebd1c1179e6e2a483ae148ada05f86c3c5d68946bb3b14d301301a78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/az/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/az/firefox-85.0b4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "e96087b52f1dc18c8bd29d486faa00ad06a2165d1e14cbd47e37cafb40602a87"; + sha256 = "b79a3e03d476d3667c28ed83dd84fb375013597d58e9e13f431eba13b509422f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/be/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/be/firefox-85.0b4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "d67c2c1556b6859e0acae5b69b3b7eeac77b3bb1594b48682a97a72742c79d05"; + sha256 = "c8e00ae8a6d66a427212c1323a0f4860c25058c1d27fc0d3bb56612f0f2b785e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/bg/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/bg/firefox-85.0b4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "b3bad1b330a5d4c515b37cddb3e89e538c5cd66ffce68dbf8d1e9adaf4881431"; + sha256 = "cc63fb7773dfe6a9b84a7ddd80873c6f8fab3b0f12e15a0db862bac9006d86c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/bn/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/bn/firefox-85.0b4.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "9c50c4e12061279133177ade4b22b7e2bb7e14dcc1875464f57efb7c7e360bf7"; + sha256 = "9fdd2e50b1fd74a3cabe55c23ca44253e9b5a2791461a2f15713cab6f4700e6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/br/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/br/firefox-85.0b4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "79eb76af707b26fa4d46acf11d0be25ccd144abda6c853373c9ec0cc872c2a8f"; + sha256 = "44d99c74041f227252989570c9fe1dc2a1519e195e6386d0dc78fbf43ec41e88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/bs/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/bs/firefox-85.0b4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "2cbf15a604f90c4a6212f5da251372d09e2247f5ed338193ff93a94695bca308"; + sha256 = "7c3b4beb800c8e023fbc5655e6435b11f6ebf11c3d82a5b6a1df76df682f0666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ca-valencia/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ca-valencia/firefox-85.0b4.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "a9b6cacf6ee8a6a1f733f3ff3741c1bb12eff823664279205906e8e59b646679"; + sha256 = "b0676d544d8d2cc6c37a192adcd4e61038106c0e84066e68895642afc8e158a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ca/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ca/firefox-85.0b4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1ea49a5d59129c820f359fbad2253e051adbb260cedd4b62bb20122562466bfd"; + sha256 = "8f170b9356761ec175be3f417df624a78e939af931376f52d36f19b019c05338"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/cak/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/cak/firefox-85.0b4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b18651df9ae2e16ea9855c30fa393dd34103cf338a515d41d3c1802e52fb92a1"; + sha256 = "ca966b90035591d3e5f886814664d2f203bc0b65e781f46566a51269811efcdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/cs/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/cs/firefox-85.0b4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4dca051e5349372d6caf5a7f6e8e6e12fe42bf96110a1c6e2f7f6e408f365b80"; + sha256 = "31e19d69e03821c646d21969b48e5ba01c52b2d5d2538f7bd7e7b93c9a6f7bb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/cy/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/cy/firefox-85.0b4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "3117d47bcec1cf0f5a547a33c62ca5ecfee34435c13a478f23d1d9f0ac187f4f"; + sha256 = "dfe3974d2328fa535b79f3e18d699b8d62a053efd0248cc88d1152ff92604166"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/da/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/da/firefox-85.0b4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "34a38c76997bdd41e6b12cebf08345e7cd19838bd92f5a8d082ba3087cb063c7"; + sha256 = "86ba3d548eb3a6408b9234c382389c0fb5907c98eeab25cc39e810727570d2ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/de/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/de/firefox-85.0b4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "65e417603cf383d92058b8976c1f6499dc5804d02a22bb639e416c4e730b4a62"; + sha256 = "1cb610280c07e7af82df2dd283a6d35c1f63afe6f11a0fd7797efc4128ad126a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/dsb/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/dsb/firefox-85.0b4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "08dacb91773d7b49eb8f08668627badae2967193c441ff2fb6b9d88063c5ffb9"; + sha256 = "555300937cd2d6e25085d5d3f4b699704ba3630ba4ce667a9ed3d67a9c9f5143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/el/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/el/firefox-85.0b4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "78e870b673c204e4d9fca2a3fbab06031c724a8b0696a3b6e2dea5ac07a5bb88"; + sha256 = "b2bf744cbe21d23a1ed16310fe552197b129964a75aca4fc1c3759fb59782d7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/en-CA/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/en-CA/firefox-85.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "4c862eb5c53e65af1ddc212a093eb23e33653341fa7db53d935ed8482637aed8"; + sha256 = "422cbea99fd390c31868b0cf0e6bc8344cca9dc9540dd58b8b315f519a3c53cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/en-GB/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/en-GB/firefox-85.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "f505cf16328603d0164e330fcef60fcfeccdad186d1f91e0b4cee1b8cc7c740d"; + sha256 = "a996f6ea769ad846a69ab692b967ea23c4de461a922add22864fce6f97d04e30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/en-US/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/en-US/firefox-85.0b4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f0561469f04ab83dd52ae4e3a8ca451d6569845e37d9e04c5a91085654661f8a"; + sha256 = "aefbbe66cd209bdd9a1720562127560212f257229b799c45de5feb4173f10232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/eo/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/eo/firefox-85.0b4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "c64d227d6b21876ea48182795d6fd8ec3ca486e5328629a0bbfb936e8463b0a8"; + sha256 = "8237d0bdc5a0ed6873c4178a20e77bb2c86f833f02e6872852d8e35e36978459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-AR/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/es-AR/firefox-85.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "73b45f6b8d1e53bef003b3e77cc1217b8a85dde49cb0900b4fa2991895e5c184"; + sha256 = "6d8b15775127619f923e7c255a01afcfd81d9d7bb01c0152e3aac3ef327b9ff2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-CL/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/es-CL/firefox-85.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "e7025e4c5fc311aae2798da99ec5e5863bca5ad8b8460981cef86e29ae37d74a"; + sha256 = "26dedb44f4dd064005a2cb935444acd0f6a99a451b87263775cad4506503bccf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-ES/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/es-ES/firefox-85.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "e819644eb6337255004fda8286e1f2ed898423c4b97694c8355c28f4d449da61"; + sha256 = "96d8444ee16d78bbde1fca5a69d5f404bdb2199757c566cdf44416ef43761715"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-MX/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/es-MX/firefox-85.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "07de091ca3b06b94e35b84add7fbc5c8fa6ea84ddfe548e5f55b3bc7980a9bd3"; + sha256 = "ac4a2e7490b448a2654a0999b77e4e3e6e8dcd96c4239654dc8cc748f54d2ebc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/et/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/et/firefox-85.0b4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "d6af9ab39f1a13efc772cbb63dd731dcf988c10f13649f348d7ddb3f6ab6ca60"; + sha256 = "d44ba8376fccea9feae2054a50db58a5d4abca559ebfe854821cca9342f05f42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/eu/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/eu/firefox-85.0b4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "110e667568429dd2b0c752962e1148884c44aaef9939926c6b0f49ba5bdb1182"; + sha256 = "d7f2131c7125fa6ee78a978e11d0f5c4ebbd55f5fa9fd8ac644aa0a9f68d60bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fa/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/fa/firefox-85.0b4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "f7a783f12bb08ccb06074f903bb2eaaab13b348c6a2950a9699beee28ad97b5e"; + sha256 = "2f63087cb94dee9a97cdf0641478b076f119bdf30dc0e3d35b9db67dd1e75cfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ff/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ff/firefox-85.0b4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "b2e47bc8ae8d1e54a1b5799a87b4742d049696edd9913f0cc6beb52a89cc261d"; + sha256 = "e8bd39fe41b98ce4fd1e630d376e263815b60339947344d82a7fddfc4ac331d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fi/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/fi/firefox-85.0b4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "f5ee09f1b9d41506ad1023ad05dbdee95ac049eb4bfd38dd99c06cf682e111a8"; + sha256 = "d743df7df584c30ab237771778df1a06a01cb8801ad57233738a9e7ee7b5a453"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/fr/firefox-85.0b4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f8c33819a6ceab041bed80f1663d94a80ee3bdb6e859eab1eb8ec9d0b67f4222"; + sha256 = "9426e988190c0f65cd87cb502064cc2cfa8146e1edc15aaff7ad3a28e8c30ae0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fy-NL/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/fy-NL/firefox-85.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "6ed233042e570e9a04ecc1e25f6211deb7685c117db75f32a541076d95d1cebf"; + sha256 = "80896d31f83bfbee9ac2b585894fbe0332c2516c7cb9eb06b10dd8169fb0a50b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ga-IE/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ga-IE/firefox-85.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "b28337429a0c1d26653fda1d93b59ea0383061a253be5b763442166fdb21bbca"; + sha256 = "678c24f47dda38562f15889bfef5de79e1375a85c8158697c37846252d55f4e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gd/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/gd/firefox-85.0b4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "546bf2f1a4a8a643b161554bc92e771644ff9ae46c6b10fb2a60b920a2454f44"; + sha256 = "87d924efdea12fa98ebbe88d42afa5944b821c4081ee0a549e66393d69c1eb53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/gl/firefox-85.0b4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "cfc32d3e7e3ba5379895a8b348d9399bd3962a819d0677f14a365f6e0c314676"; + sha256 = "61cb992a445cee2689e19415da53d5611d68f65acd8aceaada76b0999e50ec13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gn/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/gn/firefox-85.0b4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "b2b5e826540d3f9b52d67e092fa755b26a34ea9acd0cb1c69eb6f0bc332354d0"; + sha256 = "95c3467048e7250dddfcb018ae8b8bcdb9de78b3a01076c4e1aefc937f4bc3b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gu-IN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/gu-IN/firefox-85.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "497b8a954ed2c9fa13e207462730dd39d2d0de10a38e3762dac3ef1fbd36282c"; + sha256 = "1bdcef358bd0ac242dd0607545fc65ad98d0785898a6a53394d04c74c8ee0a22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/he/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/he/firefox-85.0b4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "8cdac2e9d2cf10171f2744727ddd80e21a4d46e2082947e49f4a255f174db968"; + sha256 = "5f240e3754fb368288cab3f37ab250d6815dd1b792b77180fa5590e4d9c6acca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hi-IN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hi-IN/firefox-85.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "d37c55e60329220de3d792894d7b801adf7dc7ab8ff4ab39bd2e24b59443b973"; + sha256 = "9b0eb6eb03eeeeebc78c652f4e5bf511335ebad3afed9b31eeef8f5c830b0e1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hr/firefox-85.0b4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "bebb6709dd3be119be45d9fdb0bac41b81514d78a384a221e2ffbb51b46dbea8"; + sha256 = "53bd72eed8eda15e3dd1a070b221535bda8aee3930a713b121b84b64a2f95a3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hsb/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hsb/firefox-85.0b4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "c43aea7fdd8a57653d6d9af4aa7c0be6e860f5292366ddd91c5860dfde2ee1bf"; + sha256 = "e233c7ab46d0f3dece1d580c8a615156bb70df6937d47286c3a54b4d15cebac9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hu/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hu/firefox-85.0b4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "71e6b509dd3a6937d9851c262fc7a1bc9e551cbe0515089586fc22098bc51151"; + sha256 = "2ffbc88d33631a5c0ebbc29b8f36c6b7f043b8faf0600398e24d48546d699eac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hy-AM/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hy-AM/firefox-85.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c92eaf9f6bfa97651075d2342e45b988ae89c1a4cb55559dad71bfae5912ee83"; + sha256 = "f6cbd70bd95642caf737684c8c429342e8f567061bfb680732382b5c5f93f1a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ia/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ia/firefox-85.0b4.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "3c71aafb7dddcd3f9bcc8e169281614ac1087400d1d0ba02afb18c68b1914128"; + sha256 = "ae7c96c3120c1727c4d8ed4f9978aafe64740d49111bb6bd507e4a9e14d7dab2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/id/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/id/firefox-85.0b4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "8075ef0b1d7eb2fc6141262cbb0d3831c3d8508eb43d3e9e142d96946ed2036d"; + sha256 = "680f5f3dc843b7acf86c79fb3238796ce3d28b60da3b76f55a37652d1a11c176"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/is/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/is/firefox-85.0b4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "5ef96d77bea5c94e7147a5657d76eb5c7f206208a0464245242cca3fc7fb79f0"; + sha256 = "ca40b8a9e99234faa67141732a5ef70e416e9aae08b4e8cbf6fe2ada9f0b7b4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/it/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/it/firefox-85.0b4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "eb76a1f3bd1ac065772d4ea4a435c53b5f7b1d5b643c7b62b7ccfee205ea4e81"; + sha256 = "ac8f5d43fc30760e68be4802514bf09fdb4940336d48844fe833d9290a10506c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ja/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ja/firefox-85.0b4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "80b644648b9e40ed592ab9ea2b9d7f1e2abcf8d6b0f925aa57cd6cf28d53dcf0"; + sha256 = "13c66340765699d336926872065ce0edf7e14f43b2f16dc99aa277f5d64f2275"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ka/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ka/firefox-85.0b4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "03c34e7b08a8b6140e612739118c35b05dcdef1257b4857d2fda87a1cf8852ff"; + sha256 = "16ef31cb13dc3c54196ed3dd6209bfdbed14460c38d3fc8cdce4ee7801322ac0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/kab/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/kab/firefox-85.0b4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "419a4758cf2e2e24968f4da384dbfb03ef8398713c6070ab29ce379772168f18"; + sha256 = "68aa1a647c86f2e9fe63bab675f7d851a08fb22d5ed72b10f2e6710e03e02672"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/kk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/kk/firefox-85.0b4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "cfe96420e125dd12c9a9e79e45a8d7ee260d1957abddab5ed887afd1a1e3f499"; + sha256 = "8603847204461f9370447c6c546c4bf985926353597aa7d9ecee9d46a810ba95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/km/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/km/firefox-85.0b4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "4b3599a9b30132b6105e4bbda7de370e54e21d8e498bb3c4c3d9807282fbf246"; + sha256 = "d552b9301ca160577d24267584fa3b8c45a1c6eb82cf540778a617eaebbff6e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/kn/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/kn/firefox-85.0b4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "5da3ddc9d9824e3ba59e1cdc89ee3fb8900c661faec1f539c829d0917be5d4d1"; + sha256 = "b5f4259baa11d5010fdde27dbd583f56b0c9fafaeab9c7f31be87b9645478e6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ko/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ko/firefox-85.0b4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "2db9a494693091832e578959144d172d5135b82bbf44c041949da8ffec2de9dc"; + sha256 = "e73be57006747f673e979741203537cbbd8f9fb6f4fb77cfc88a7d0c85c7a7de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/lij/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/lij/firefox-85.0b4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "2219d5235f0ed9d2015ead5782976727d2b7103afd987eb445f3f274856e6af6"; + sha256 = "3190c816b7a2973aa7d2a0640fa4e174b02b62a62c28eed7e0df3b377242aec3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/lt/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/lt/firefox-85.0b4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "a335e0d835bcc7ae9563bb3efe6b926ad71e08f3ccbd164aa2b9f257acd1341d"; + sha256 = "95a68d2d1a98bdda38e86f4c14c28669d2a11792fab561d6a8295c017d1a5068"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/lv/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/lv/firefox-85.0b4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "1f89f8f2715254ef335af9b01ca1503caecb1c93b1a900ee1643c3f9e00c6821"; + sha256 = "3460fb2356584ad3cd02905b9b3a70a569ef78666a69bff754fbd0b0eba0cd1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/mk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/mk/firefox-85.0b4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "86eb9f1e8189ce45c03925337a90f1b204dbdc902c1c4a817a924410a26b0048"; + sha256 = "864d8ae602b06c75ebf0d0bb4b8fcc5722840db373bac1a5656a968df7aea6d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/mr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/mr/firefox-85.0b4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "d5214647403f85c5f7a95871e8d6fb4d4c448af92e6475841fd8474857f21067"; + sha256 = "09e63b52ae1de354e73838dd0a60de360fcffeaeedd8af316174866a43c49293"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ms/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ms/firefox-85.0b4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "23af07562748448a35242a6cd77bce25a5576d2b71177fb682da58adb21671e3"; + sha256 = "c1e47d112d887922d81458bba8a7afa0a706444624738df92cdbe395f4bc9d0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/my/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/my/firefox-85.0b4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "bfec2f3ad0853fb36ec4aac9ad97ba14d30a275eff2582c2e9df600b5940c004"; + sha256 = "d78413226f8b87af0ef5baecad2ab4b9ced69358cca969635b4f71df645ccacc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/nb-NO/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/nb-NO/firefox-85.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "32be6fe8aa661f6098b4600d824846738664f254ecd4ab0d0a1e705b28a94e74"; + sha256 = "5ecff68265d8ce7c5a59da0366570adafc69b8c05fc323e619a7ce08fdeb7108"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ne-NP/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ne-NP/firefox-85.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "dfa3e6b9f31fa716a2c80fda07c24717a526ef96033b5b1861fcdad43c99b29e"; + sha256 = "00824ae4fa57e98fba5fb1a46b86853a289e24341b94d2ede9e8e7d358d29e9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/nl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/nl/firefox-85.0b4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "e253d963b66855c44f41c43baba1b5c952b37dd1b83aac8243c60581ca674a49"; + sha256 = "a0b3a25bdc123bf9ea441456b7d1b3c6fe78ef1589b69742dc38f50d3d92d700"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/nn-NO/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/nn-NO/firefox-85.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "5d9b90cdee03a544a78f44d4f0566b5b59ae802af4fa60367a1a4836c01197f1"; + sha256 = "00f599f8850af9df078c5d296bfd50a7bdb012f7978e83828000371fbdd93509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/oc/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/oc/firefox-85.0b4.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "b37f9a283d9dd2ff9e8998d83e0c147bfbb75e4b64b3936cb344243e1277c370"; + sha256 = "d03638662bd89dfaa1af08312b5361da04d5cb9c93f6eea9b2442bdde25d1eb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pa-IN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/pa-IN/firefox-85.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "68f6bae2e6f064e22503145b5fd57d027899f23fcf109010a98397dd8c0d7cf6"; + sha256 = "2b7d9ed3aca15e5bb22f3fcc5fa0e6289729e5a88d8a43602a9adf38c4e0a8a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/pl/firefox-85.0b4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "789d6925c3b17f96bb92eef54c05fc8787f32ce2c9846931e185dc5a1de9f303"; + sha256 = "afe081f1f64aee140eecf24b413f44fa04d999f3bb97a2862a8469732489e94c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pt-BR/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/pt-BR/firefox-85.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "329eecf74dc8d9d1d8f4578389553d92a368c972fcb2468e0b936f21508bd1bc"; + sha256 = "9e643c670efe00e9144529aa65c8f10ea2c8f7d5374a2d93c439a56cabad7d2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pt-PT/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/pt-PT/firefox-85.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "b30ba75dbd5f5ff3ff709722acdf36acf4de9993d230eb27996e81406779dd0a"; + sha256 = "98cf63382a586b649b30685bee8591085edf46d747860fae751a5dc4ed183979"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/rm/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/rm/firefox-85.0b4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "ad90ce4fbcd094bebf77b36a63e38326c613bffb580743c9a4c19df845907dfb"; + sha256 = "e000820f06aef69922eb0305e4d70cdd1820f86a1bbb60cd0888cc5b5d6ce0b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ro/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ro/firefox-85.0b4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "8f7864bc6577724f20829ad79901d92775200860dd8c43bb2443c7bf22d7a435"; + sha256 = "daf8f2419a8122ac4da0dd585bc466d404f9a1cceb82aea8732aa4ec112219b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ru/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ru/firefox-85.0b4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "8b52d5eaee53805422bb2fd6dd8b2e0c7a5b01feccbc6fb6c77e4fb8678d30a9"; + sha256 = "c081fddcc21b73b421516d529d7abb6d463c804f1875b4b755d34c0be34cfb05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/si/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/si/firefox-85.0b4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "a71df756e97f58271715f3d79a86c0407487dd5820500127cbd9373361bd016f"; + sha256 = "607f0debcaeba1a5a6bc270e4a45793b56d4fb15580da6e264659fc3d4ed6577"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sk/firefox-85.0b4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "71eefff1538a2978d9e4e65fdd5a2322ad81ddfee33464c0d70b95eda1649fda"; + sha256 = "d3a06cb060f6ec2131705a75187dd5ca62fae91a22258c59f93c308151ff7b00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sl/firefox-85.0b4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "91b2938be8230b6301fe3d15c6d9ba3f031c1e5fca886da228f47a2e0a2cd144"; + sha256 = "eb9c21cb4c577500464c8fde4091207a93ab96cd4a6119feac815242e846e65d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/son/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/son/firefox-85.0b4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "57e456cd14418c41c2e5f8eb0ec6b0807459f41e15207f6997c7742fd3dc8a1a"; + sha256 = "ce5449dfb0201d3a2c4891519284903af46177739feeea4353720d108107ccc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sq/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sq/firefox-85.0b4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "0f343e2442523f0e422309cc36518484a242db4116f0e6b7dcfe251cdfea76cf"; + sha256 = "65ab1b97653e2cb416d60f65d6fd7696cf7b5f63bb3b80d13fd199829247ca58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sr/firefox-85.0b4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "cf8fb723611506fff356cabd91a0ca3fdd9cc5d806167df6dd385438d467eeff"; + sha256 = "16c5e71c6dc86688d3cddc0330fcc98a7e948773833c3f1d856b194541fecc3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sv-SE/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sv-SE/firefox-85.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "258020bbc7a75139fee340e50d41676d234be19c931f0228485f06fcab2eef81"; + sha256 = "7bcae95e5c57d1b380458ab30e2dec9a7bd2c1bc6c2712fa44a9245639ac083e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ta/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ta/firefox-85.0b4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "7783166c0f9ceed0f7d037c1e92b988818a70522945af2c96db958966eed8b66"; + sha256 = "6f35fc2329ea0a96049c9cadaf925ed064e0f4b60bf12082029898396ab34dc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/te/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/te/firefox-85.0b4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "02662946b3506da6432c48eb1c7e0f522ffaed2abcfcc474332a799ef3be2b92"; + sha256 = "9f4c691b6943f715e6d6a1db9a36cc745614ac99a33767080157f852d8cae594"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/th/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/th/firefox-85.0b4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "1592b372b8e767e5b7369f356fb733a2daf51b4f45c8c4c94041845d63b3c604"; + sha256 = "c15b8db3bbf1bd9362bb5f024daf0aee7ef3df8cd7864dbeec6a824449722063"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/tl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/tl/firefox-85.0b4.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "2b831feaae729c674e8a9ee207dea007df100bbbd8cf7553791aee3eede37224"; + sha256 = "98837a0ce69e67b9bcc518c9953763331757870c5cf1ecaadb1cb37cb30338b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/tr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/tr/firefox-85.0b4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "aedf8b7684f204109e42a3797ba00bd7a8c5bd3f827c31ea3fd4eea1679d8af5"; + sha256 = "cec9efb3c0ffd4f7438964efd34d78b377f117fb0f9d051e103663a676d6a6cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/trs/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/trs/firefox-85.0b4.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "232cae54f6120a47455fdd7e0d88dde1f64d5a1931bcd7d54f6bf8bd376583e8"; + sha256 = "151687f7ed062ad3d0b46b113a26931c41dd375d324aa7055952492fd497c445"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/uk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/uk/firefox-85.0b4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e00de7cbe1f00aa082f9a448857cc19f011bb1d5b579e79457bb0dfc72b7a12d"; + sha256 = "c0335c927cb343b3a48739949c3d8d1a813eb5caad4a989dd9a3fec16e4c5688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ur/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ur/firefox-85.0b4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "7ece4d8af476eef174c0c175b65841da8d826702fb255587c2e1d259bb9ef3ba"; + sha256 = "5b4a20c279161d910dd6730f1691d4a4bb8319a3e365bfbcc553a47e96d9db30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/uz/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/uz/firefox-85.0b4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "09c7e7d641f703404aa7927860f2924e6be376b2e39b1f0fe012dc87469edb62"; + sha256 = "8fd7881da8c03c3b9313509047ee453d175c271fd086e27710bd0aba3fd319d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/vi/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/vi/firefox-85.0b4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "18121867e6b8c2a52c5324f653f82afbae97481b5ac3df811e881ec39bbb3b0e"; + sha256 = "7dcdea1143af2cfaf9974640d520fec1e44cc156d085432f52318b745dd21f6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/xh/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/xh/firefox-85.0b4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "04f5bb96ef9002eeb0869236f70168e7cbd7842b8e12b66dd6d5d67db9acd28a"; + sha256 = "f502767929505209d05830b7d0075fcf8186349afe07e793afee560eed9aafc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/zh-CN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/zh-CN/firefox-85.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "142286cf9136bcb9b6af7ea1df3cf77821c0793ab7b9fe533a2963c453f45a7d"; + sha256 = "9d8c003da5dc117cda204487ffd0dd95d9677d7e30e5f868e3a39d3146569da1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/zh-TW/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/zh-TW/firefox-85.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "fef32e5817140bbcb6d1b614a72a29523235606192078eb04420ff7a2453cb9a"; + sha256 = "ebdf6822810a97381e63c6c2bb08baea4c239c35b4c75e714da367f982080863"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ach/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ach/firefox-85.0b4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "40e9b7a738e06cec731c69b659b14ca48b119ae20016e0214e1160edf03919b0"; + sha256 = "e63b45c8a34d286097825d2830b3697a2205fc8f62e7f7b19fa5569294d4fd3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/af/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/af/firefox-85.0b4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "9bb05361a51f836b2de5614127f8df768e504f4d5bc136e3f169741098f0bcbd"; + sha256 = "93f0fa71381f937d07764ed4bbdb1ea167664fdb1ed40d063b4fb079ed485dea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/an/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/an/firefox-85.0b4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "ee62418444c76b709204962ed47af8ef3d61b80e628600201b5a12293651c70d"; + sha256 = "1ce6d8e8ba3409b7b5886f87633609a8568ceabdef45beef623ebf74e4bdbd76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ar/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ar/firefox-85.0b4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "10b5d4f1616e078bf83ab5ff942dabe89a8eaca63f24e96b53726dfb2bc9e36b"; + sha256 = "990905d68a82f3eee04a9a8df4b291eb425469e6bf045a3a126bee08af2b785d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ast/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ast/firefox-85.0b4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "a4e5ccae125edaa0696b696a5342320707f0c39c8985437b6aed60faede71de0"; + sha256 = "606c37c4eda9d1f55e8a8fde0f8df822186995cef190e1644bcbe465cc1a0f54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/az/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/az/firefox-85.0b4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "c13d9ed183c7b9256801708014f38405749cdfcead9f243e80eef78d06a9b78e"; + sha256 = "0d2cd416e309ae19af4f3704823de50b560863dc1f1939e75663e9976cbb5c8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/be/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/be/firefox-85.0b4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "57d8eafc3d45784dbad71eb49d5a4c0483d939719b43b0f16e4db1d5a96ff4a8"; + sha256 = "fcf922756a6830d9bf76bed71579f4b6e2e47edafbb843ee2a490552cfc88f86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/bg/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/bg/firefox-85.0b4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "0a65ad71cc9d97277535f07a8dbc7ca248508c24dea8520f92fecbb806f87a31"; + sha256 = "9d40f252156d646363e65aca32ae4ebbeffe147dccb3d4989e79a57a4dca57fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/bn/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/bn/firefox-85.0b4.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "3cead08f4d746def6cfb909107f4739400498c970f10fbd542259c04b84b5852"; + sha256 = "9471636ffff7f11db45001af18d86ae0d930517e09cd2aebb0a850a946b44917"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/br/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/br/firefox-85.0b4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "40c6e963e8e52ef51cd4d4e63d501f2a6cecec1800541941458b896ad90e5b93"; + sha256 = "4482fe50747f7fbf4db5ffb0b3c16bc0245fc0397f582e73c609a8cbbd48c1f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/bs/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/bs/firefox-85.0b4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "1e9df53642c442ead4318b0cc886653fdfcecf5275d6e7218acb390bb13e0021"; + sha256 = "5357a4fb56a4aeeb43d98f5ace310000532da9088ca0cd06c818d3852fb38452"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ca-valencia/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ca-valencia/firefox-85.0b4.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "3b5699dad93291921979fc6da21d16f94ef471e9a8ef3d877001400ba4abe316"; + sha256 = "1a22b215fa50f947afd5657ec702419ec708133f89f372d7667d12fe0e3b85eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ca/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ca/firefox-85.0b4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c52b9cc25dc72eeb6ef3e7c3add4066c005399afdba2cd0964e695a891a1d314"; + sha256 = "fd335110bb31eed1e1854d24c74c51b8ded826008e49d8ed6b1f7be85ef05753"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/cak/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/cak/firefox-85.0b4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "355df19615fddd85c51b033a413a3de524f19fb2d97a2ba77f3b8001b231338f"; + sha256 = "b852765dd3dc4530c1d1d00232c6a615472d721d1f69cf303ddfd6d6b26d2745"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/cs/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/cs/firefox-85.0b4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "e10f35795f19ea10c4de34687eacad6f9bd863002e9d66b87cbace01b97c8628"; + sha256 = "747f697ca9aca2b1982a95a3d05f4549d3f1b276cdac39e17670c0b101f8b704"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/cy/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/cy/firefox-85.0b4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "f2fd90b19e8c4ac98bd6ee262084ef7842e52a304abe10cfcda2fc14ccb5ce30"; + sha256 = "4bf87e33539d8bc383715b89a5fa5e1f5d1e272a7899689585f9fdb711a5e259"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/da/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/da/firefox-85.0b4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "01e468f3a445276aea85425b4b8a58e44a2e4cf8552a02aa3d4d31775bff9575"; + sha256 = "bf9961aef493ceb1613c91d79ef1c7b718dc5e39fa3ad8dbfb012d51c16b1e5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/de/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/de/firefox-85.0b4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "9dd3d806a4ff60c9cfd5b81cdf212f72c281f75ce554555cfd443f0696f700d5"; + sha256 = "e4e85f2d49dfd9b4bf62e4ee2e77d03660f0b6ae9ce7ee827a17f2f067768b59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/dsb/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/dsb/firefox-85.0b4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "eb26cbad496bc1c4f97e6027a1f2cd9166d479a503a3f0ac566a766c86bdf8b5"; + sha256 = "71a3307575c45643d8121b64a345c19a6dbfa0924fa7d91b5913d52ce7a5d663"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/el/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/el/firefox-85.0b4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "e173622f06f64156d749d0f56d98be72f067077c3e41090aa16a3b0c6d7a5e43"; + sha256 = "75bdc62ba592d48f172af3b072158e14ce0f433c7ee3b44f9bb0f4e0f9c71834"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/en-CA/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/en-CA/firefox-85.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c1c6aa503e1565cb0c0239d562f11322265a7bce4005211b8007579f8f56c318"; + sha256 = "c7e2bb86941274de33368c78122cb14bc52c4177de2b9cc757d269d9d7cff40d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/en-GB/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/en-GB/firefox-85.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "57b2670f515e2a17c10df602d93a6960e5c4710462098d89568efd446e4480e5"; + sha256 = "46c5821f9e973a599c74445ab4a44ca31b3f76e18597f4e0d77479c1cd0d3841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/en-US/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/en-US/firefox-85.0b4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "81cf4a4fe610de3342bdea340d450ff67c594e7e4924a08b6b69de75510da698"; + sha256 = "4cd2facaa0b33b02228405e74689770516e6af6f07de8dac096bc66ca9a238bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/eo/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/eo/firefox-85.0b4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "dd61c4bacfe39f7887c6d21d139df6a2df17f263c4be5689f5f9dd6bb4ee6e63"; + sha256 = "6966ac14fa72fb627955e9281c6e54f23eb03b83647cd52934304d672adb6d5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-AR/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/es-AR/firefox-85.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "3ae8695c57befa3552033bcb867b48f9ba491a08e31168ba22901fcb3276a3af"; + sha256 = "ff32191b95dfba73d85caab8aca47e32b2579f92c9fedce14f6e16a6e42c2178"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-CL/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/es-CL/firefox-85.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "5ae14208cdbf0dd50edecb8a56bfe7dba0e7520f2ef135abb092761acc8630ae"; + sha256 = "a7c7a9f646492e8de8474f1869075c568774ccc0118c340721b70c06e5471a5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-ES/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/es-ES/firefox-85.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "d786cf3b623a05e5156b020a436897525e80117ab7fa9f25ca42fca9fb4c0eba"; + sha256 = "71e78fc680de3dbd91b77bb13b113ee5f34463aaa4791a3b0a445a292e5d0732"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-MX/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/es-MX/firefox-85.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "c2ec749bb5befffd81189503d87a57bda462897bba858904924ae999923a4e42"; + sha256 = "9c357beab45fad0e56f957fa73b8900a916c6cbcc8b18bd5389c0a977ddcd18e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/et/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/et/firefox-85.0b4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "7a2e1078ff1a3bb975baa5488f89e8161e20354d7f55b98c964efa5bfce6f696"; + sha256 = "a3de258fcfc4d633529566d2d8f7bb582683d6dc22cb3c9ad13a4914b84b6100"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/eu/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/eu/firefox-85.0b4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "c635006a367f68bfabad7a3874f3333ac3f486f0001ca9641ac8ce12dd9bd01e"; + sha256 = "092cb149621ff664ff4462c39266ea352971b30f5dfb0db163b62cd3af4e0fcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fa/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/fa/firefox-85.0b4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "f897a5d316c436fc20d8c2737902e29dfd0ece3c9ffdb90fda2fa454ad398257"; + sha256 = "083d17daa3f86af4651cf433180750bcea6d00758ada3ade80bf2f713b3c04f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ff/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ff/firefox-85.0b4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "3a31d43cb5242a0aec516d8fe99dc916144e8b7250b81c7de0b1361b19f067fa"; + sha256 = "7de0cfa6bbdd1061cad1a72d80f5f504dd163a066c9911e1c44428f02b1942d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fi/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/fi/firefox-85.0b4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "50261499bd4725f08684c9042056c9da2029f55b0dee4a856a9de661412c06e8"; + sha256 = "d718ce1837fcf64bf2b324724603559124697e58ddce8324c79e582c7f644205"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/fr/firefox-85.0b4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "7b793590a975a64b6fcfcccb4e6c07cd5346ec457af1ae31b5fb1032d4217c64"; + sha256 = "74e2ab8182100b7e69c62698bcf5b03cb127f4e90dcbeb35bba7d66b58a711e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fy-NL/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/fy-NL/firefox-85.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "468c7463503a34de44a74ff6a751e8614abbe6bd23f39f50308f23000614331e"; + sha256 = "135317f51eb93e2bbc18401c8e5fd2c070b3688fc6a9bb54e9e78bb7f37c676c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ga-IE/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ga-IE/firefox-85.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "92b49316d122c8c91995766e28387d5587955e022f844c7a85fe491ca602e222"; + sha256 = "77fc52e186c1f823067a7fdb549232a080753c813afdece12f49444bffa6507b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gd/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/gd/firefox-85.0b4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "4bd2901b705f99bd1889b21f4af9ba7dd022f608960807f96f115a110c96a80a"; + sha256 = "abcaca790054b035687a78e9ae8151459af4b7f2d9d561d6ae41c87a0308c694"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/gl/firefox-85.0b4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "391d62de840d53d531130fef0018c71add0ef7134fbc758eb869da7c1cc3b5f3"; + sha256 = "291adca54f86591fdb67c6a958eb7784b5d5d4996858ae8936a5615c89e2fb4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gn/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/gn/firefox-85.0b4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "d51f75a7718e78bfb1e9d0974db0a404294e577e186794d3480778c7facce418"; + sha256 = "0c8dc262e96c0a912cc8aae7e1ec76da36091cea47ed535eddb8039564ed24d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gu-IN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/gu-IN/firefox-85.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "7cbbf4846153f79fc72e217872fd64b92ed8968aaf618eeededa375ac268a12e"; + sha256 = "2fb8fe3c39353ae9b03018ab17a3531ae20e1a6794871a7ff02108484f641801"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/he/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/he/firefox-85.0b4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "44c0bfad535a4e3c225d948d87935e08e5d77ea22638e971cc833877462edc32"; + sha256 = "3222cc40ba99d0833a3a8c5bd2e9e8c74ffe0e2209891899e9d37b6a35bd8e41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hi-IN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hi-IN/firefox-85.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "fc64673429972967238b5bb101beb2117cfdb0360e405d4d3b53f013791c0b8c"; + sha256 = "bb633eeadb00cf6913190221e5720c68da8d7a7d5e51b5f1d32621ab35fdf7ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hr/firefox-85.0b4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f256eb4e655a14b1a084af7f72ef4673d33b42d1c23ffc1ff3b4ede42d966246"; + sha256 = "21a8dd0e511ff658e09a5497925fba833c32d1bf6537f11e53eafb07d6bd8854"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hsb/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hsb/firefox-85.0b4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "9e1e478e501875ac259e22287aece77f1bbc1f898355ab1c29fa26543b38acbb"; + sha256 = "c862804fc9602884bc8074631d51e091866177682a6767e5b4935a3315b2ea82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hu/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hu/firefox-85.0b4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "e8605e1b9d2c92c2eafa35cbe647bdda6af22eb030d8656262473b0b17650de9"; + sha256 = "bf92592b0f3697e828c9b07d24c5394ef6cd980c94248ceaaeb0181a1d0ddb24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hy-AM/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hy-AM/firefox-85.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "be21fea69e27ce54498b6b003c1db20b42d7d52702ac56d1a1fc2c6fc24558f1"; + sha256 = "fe5686fbc9c1a173c4ce11695675a4aab2efb7d340bccef797d8a20eedadfbc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ia/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ia/firefox-85.0b4.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "039f50fc10d95bdef4468174a8486f45bbf9313e1b9b6cecb0d094bb3766ca9c"; + sha256 = "791423722d872ecf6c45e0f16b74626e19764c003cc5f2ac2fbe3e1bacea9422"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/id/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/id/firefox-85.0b4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "ecd6f3e031529e1fed8fb7ae77bf6e0497c9ad0e4996e31a86c4b79489ba9811"; + sha256 = "df4b06f6d4946d2dcd55130df46b7cf5e391ba433eef792854ef8338dbcd891c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/is/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/is/firefox-85.0b4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "1f6fbf55f1384141826a4b6a39ec617cc798b0c0a0e1ee02d6cd65a79d6784a9"; + sha256 = "d60f08191a68e5f4cfaf5848c6d0a755c9033e853e6da08eab6b74362c220ab1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/it/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/it/firefox-85.0b4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "73eebb1d351b5d746d3447c7a68d7a906c4db6df8cd257c6a048ea16cf908e64"; + sha256 = "a1d38ce8785cc3f15d777e226aba48fa1448da021092d9aac340cd02ccfb5669"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ja/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ja/firefox-85.0b4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ff1c630c6c41cd31c8ecab5fc48e8879dbc4aa295492368cae93061de6558b64"; + sha256 = "02626394737a87d0dc80365b7ff7829bb1d1191a65a063d4d079735199ce2731"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ka/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ka/firefox-85.0b4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "b6976def40cfd05543b70597347ea7c632c591660a2dd08332f81411a6ce6723"; + sha256 = "4581ada66c25d45db22d4cd41356e30b0b9fa88132758e219e15ed70dc4055a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/kab/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/kab/firefox-85.0b4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "403bd985ff7ab44324d12c8c7f1386eec9fbae97ac9a0597d12d09d387686db4"; + sha256 = "24b4d9cb927322b3805e930a54020fa84e3925d824363ef824501ff2769cb015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/kk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/kk/firefox-85.0b4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "3860b0e8d53655669afcb4bece7637e9a1c0daa66d453e9548b2336eb45d94ad"; + sha256 = "868d5959ba761e578b5a2d00a29c244cfec0108a294fd52b18682cf31173b9c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/km/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/km/firefox-85.0b4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "5753474371c7b8663d45f7f9591958afb9e9e2777df3e89840f6f34894ddf491"; + sha256 = "e5f63ff912c920d92d7608e2746d429737f0868bc5fe33d3c460ee1f745e242b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/kn/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/kn/firefox-85.0b4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "d0dbeceacf93c3a581cc581e09507e401636350b763c8c9f5342b33a0640bd8e"; + sha256 = "65d45e29f289cdefecb369862fee62be698abad2b8452687507a52149b4d1de1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ko/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ko/firefox-85.0b4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "095930063eae8e3d6a78a6d9adb3d28cff0bb0c9ccdec977c8c80765a4c60560"; + sha256 = "83a516bbf83574f20339382778378a889016e5947c882fab63aadb728023465d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/lij/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/lij/firefox-85.0b4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "587bced8e4480eba25e8597ab6b838a4f18553dd44b4f0ff48f245406f78e896"; + sha256 = "690522d1a0d67c5538d567accde52effeba8b16cb4c36920aef230a62e1f655d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/lt/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/lt/firefox-85.0b4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "e214c23914e05152973428f5ed1df20054df054848d99ff23e5eb09e19b4557c"; + sha256 = "f586dd3c96aa61d9aa19ad734f4a61c9e1f6a530795ad486a2a1ff4cb18f0854"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/lv/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/lv/firefox-85.0b4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "67657d4abb394ef76d37c321625d99dcf228ee00cc109e6d1c80cb3659db9879"; + sha256 = "002bdcaf29f65d2c81b607e36c280f73a08cefa32f9e878ca2c834b80eb69435"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/mk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/mk/firefox-85.0b4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "bac0e98b7a68dda441195cbebcdbea583f104188112449b14723c1086c3c4f19"; + sha256 = "06179e95fce7f93f410983664077e4213f31272ea626a8b3fefe1e78dd0b7fa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/mr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/mr/firefox-85.0b4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "125a63c875f4be6e246fa01289386295172d999e0e523c1171578adea24b022e"; + sha256 = "532c17600a7ccc995424759043f0dcf0df5a10870bd7daa92c39f3a2a0b11c68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ms/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ms/firefox-85.0b4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "6dc44f34449c915e93bf9c012ce7286b16d6418ca8f576d8a008b7ceb90bcb13"; + sha256 = "b315e64474d410e4c6c403b1083b98fe5bba5f20fa4fcb115671c58075e1ad65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/my/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/my/firefox-85.0b4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "af5e2f1f9dcca84f41d3701035a00fc6b581aee2bf00f9f926928b99ab42d06e"; + sha256 = "848b472edef05971e5d6b003a1d3241c0d34a3f0b2a54ff97ed3a7f2ac96bdde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/nb-NO/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/nb-NO/firefox-85.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "d168631cc1518e17cc9cd85f481f1047f6ae7df593d9197de5710fca0d87965b"; + sha256 = "ca2e64f608b908b752413d9da7c8ec2cf23ab2f49df6362ce381b0d31e9caf56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ne-NP/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ne-NP/firefox-85.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "4b6065882ddd9e02441eff830808b31e6104d076cefed8386cff4ec7cb12330a"; + sha256 = "3386312e032b56457483fb46d935773adf12f3a3938ac4c6eb5b0c12242d93ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/nl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/nl/firefox-85.0b4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "96298283a2dbd9e3242c27551ee29829b21c8b9a32ca33b85da3142c47084dd5"; + sha256 = "7bbf63a4acf403611daf55e6663d796a46201349d29531245261aa5a8457e4c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/nn-NO/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/nn-NO/firefox-85.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "19475301d3d93a633a1555b4436d63546a71160a992daa760a8c76a808791b89"; + sha256 = "f126bb842ae56504ff25f9ee0765cccf7b9a4bce1d45d382f6c13d23792bbf47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/oc/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/oc/firefox-85.0b4.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "48af4af195173b541d76bb623acc357c3a2a8d03227406a21de89ab2d6c8c757"; + sha256 = "3f4045cfe03eb4fcd16215b5693913577f6c5fc68ba74528c6575a5573528241"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pa-IN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/pa-IN/firefox-85.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "582ec12fbe2f8b07f8f4ae11ddf05c62db2d84508ee63ad6bfead9493a1424cc"; + sha256 = "cd4e81e714f78303603c390b490144e27f5f83ad436e610842aa04c242c8a549"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/pl/firefox-85.0b4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "df8fcb5fe32325d45fbc1c9349065cd2d7f283e6a33d944282f3ed948c1174ee"; + sha256 = "9147013773bab5f5da15e021becda90d63daf7f7068d7947f9d7eae3bdb0e124"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pt-BR/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/pt-BR/firefox-85.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "fa48bc301c9b7dac4802b50980c573039648eb41bf0c0fb3ef75d0ba1dce9b67"; + sha256 = "20efb971aaaebe780b337d1525eac527dde028eadecd5247321a5db5f0217143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pt-PT/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/pt-PT/firefox-85.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b0075346738d9a5f61fe4c3265c3a50f639f017551d3bdb2479e622d9561bd33"; + sha256 = "765cbe09264ffc15115da555500ae376bc1a91458c872ad7e4876701aab6f10b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/rm/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/rm/firefox-85.0b4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "c9ad20ff328c8c0693cab58fbfb1d6c1f85bb63fdd20eb8d371e82d4df5c2e50"; + sha256 = "93f5d6ed649d275ad4ee1f9a7075e8b4270abe6275b57eca0759b2a8efb08cff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ro/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ro/firefox-85.0b4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "7816302b6f70c0e24b848d3d396876ee0d870d90561c37e440bb8b7722f54ff2"; + sha256 = "aa44ba543a08a56f46e220f41695da4aa0fc97c9569563ff0555f308117cc983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ru/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ru/firefox-85.0b4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "8f4969a16f4e70b59dd2da78b73532ff39589c984512d16fcd7106d2cf503342"; + sha256 = "6a17313ad121e9821a766115259a8f29ace0ae683d18a86c844073e671a4b0cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/si/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/si/firefox-85.0b4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "0dfc4c1c797366ac9e65489b07de756a1b03b5498c9e4a6a10ac0d3a60345471"; + sha256 = "2766789c614ca35f6ec7177464c5cd2f5df5ec1ccde71e1835efd6f3635e0de5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sk/firefox-85.0b4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5e16b451058d64ea0cb61fa92e17fd72e591009803170b0b220237cac7180167"; + sha256 = "7de262a9caaf141c37d819f89eb3b1ee7ab932b10e345e7f9a50db7f1e8cdfa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sl/firefox-85.0b4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "36216a3b474d3fd1d27886495f92eca83d24a465690efe7356ca9e7e4c08163d"; + sha256 = "e31fdd4a192daefe7a3946976c7682e15ebb61b598c5dcf8bb7a870efd3a9e27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/son/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/son/firefox-85.0b4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "1116bbb70b7ff8538d3ce4e7df190bd152c98889d1612fa8485cb0197a83868c"; + sha256 = "532dd0db390b3d8da03cb5f01e26dbc0752365e782e0b2d11925c14f5dfd8f0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sq/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sq/firefox-85.0b4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "006948f771f4964f5f4f078615cbb85aee23051e371ff7b871caee7c4659fe64"; + sha256 = "35c59d0543506c625fd6ab0c181566c5f370aee2504970fd37b50d0d34ed0e8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sr/firefox-85.0b4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "20b0b9d605603e525d046424d290e6b2a0c963c0eae2a9a6c6ccdb72a9803e9e"; + sha256 = "a6f9d8fdcfcb4b4a89e14b84e6a88bfdb0d6b578ee8e4129dc1f82bd933ecdcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sv-SE/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sv-SE/firefox-85.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "a132b97019c75aa8929830f873974e1ab36b69ca7e3c9ab44dd2a5b11bbe4f7f"; + sha256 = "664b8b51429c0267a745a69906f32757a28a4ae8b23bc2f591d3b190a3091379"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ta/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ta/firefox-85.0b4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "3f24d965ee5c89edd447e8a52a0241a5d1cedb0aae6ed1ad1c212ba4dbed210a"; + sha256 = "05679379a0abe41cf46ab182018810ca42cf8b81686f48c3c644928db85d4c76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/te/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/te/firefox-85.0b4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "2b65c7bb7df93b2bdffa687bd4309352f0d73ecdd66767db0db860f33f17c6a6"; + sha256 = "1c884e460b6e5a0e0c27e087b3f81a3c4245f6a5ba5ea2784b2b0b61114462dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/th/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/th/firefox-85.0b4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "21e2dca4e194a38de97b9b717150441bdd32466ee43e721f41afde004bc8e3e2"; + sha256 = "9ea2b02fba273e970bd2140e713468b300fda7cf50451f5f4f840220b782e1d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/tl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/tl/firefox-85.0b4.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "9f4dc351f5244b0837a95d4afbfa0af373fe056e5eb106a2b177a57ba4c85ee7"; + sha256 = "ea9334cdbae5921720974575477da6310fb75c02eb068cb13d700b71df1596f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/tr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/tr/firefox-85.0b4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "50cabe6fea43e2212d0b0a9a5a382e085fdabc3ff6b6b0694b8f9d3d327c3ffc"; + sha256 = "c2314d1159313ae8d330244150cfafb5345d7515c5062c62ae31d916f69bf4ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/trs/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/trs/firefox-85.0b4.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "c4db90a9a0677430fa591cc387bf1255f260208a4907cb760649cd7a6db03808"; + sha256 = "769acc367c1dacee2617e784a98d4c546857123690f902783ed9f97c10062f8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/uk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/uk/firefox-85.0b4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "7c92d619dd827a9f7ef9297f784cff582aba44684dca91c3b9873337b4318fb3"; + sha256 = "d9c179bc63a3c9d8ec4722afb4cf4a3cd4175d01542477fc132147521d7be0b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ur/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ur/firefox-85.0b4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "ef46130577072c6fe6b14aa0710c75344dea46124093f483db47cbc8c9cb4ec6"; + sha256 = "ed365cdf1f3ca389b308a2b9ee405917da0dd0cd1536c9c7a4e13949b118a2ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/uz/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/uz/firefox-85.0b4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "34c28440a7772a7fcf7f920be760f92057d813648372fe7cb8ae9f2c3fb3a846"; + sha256 = "b6437d5c406edfbe0c3a114d230a5b9beaefec04e48c92d01a7cf900f6dabd56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/vi/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/vi/firefox-85.0b4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "c02c1737b56e1ae4f20ffa9abd392fb69f19d68348341977d0f39bfefab465b6"; + sha256 = "1d6f91d852f0b20e357e1accc6c43ad93bcfe2e5a92f04a89c1d4bace70285cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/xh/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/xh/firefox-85.0b4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "6be6defb443480c536639d99d124d8c636d70f049f126a793d627c131035c9c2"; + sha256 = "597a04402d0d34f10c6e3fbd0f629eb45c6b3b8eba2c63917074bb34c47e8cf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/zh-CN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/zh-CN/firefox-85.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "454af78f3ea4aa00676c4b97dff278dd404116e1da7993b5a2593167d11db885"; + sha256 = "e4df77f3447615bbbcb21904f15d2d18936ef7216c047a62c6901be00343df6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/zh-TW/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/zh-TW/firefox-85.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7e6b1b0ad56916759b01df06b23bb6a23b0c59815538cb1edb3e95edf7b772d7"; + sha256 = "f0d9f95b465bf5a60bb0ec5906354acb705e78ab7dcfdcf0c09a3f26e4fc7bfc"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 431ed105f0dc9..1620bc6063d70 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "83.0"; + version = "84.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ach/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ach/firefox-84.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "cea6ad61bd402e6c84a81a3f504f1b9292079c9d48d2353b51db4f03a8837fb6"; + sha256 = "576e937824252ead56b4b4472aaaf8e3553107c547bbff74457a0a1d33b721fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/af/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/af/firefox-84.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "d4bd0a9579f38d53f559412cc3cc04f11871ba22c81eee54dd9ab16c56303513"; + sha256 = "ef9509ce8cc5f766aa3072c78750babf1bc26b4211f0f5ac7a4c88a29cdac875"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/an/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/an/firefox-84.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "10741a6921210643250013c45e9e21bc295da8e41f2bb5c5fadcd86c0e828c80"; + sha256 = "7bdc125a9ed334f2b3989d40bcbbb526ef583823be5bbba590bdd7fb9562d32e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ar/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ar/firefox-84.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "3fd4aeef281e5aafdda572d4814e70295c018b7fae6d214c40dabcac367ace69"; + sha256 = "710d77fc45c4164c96194209d2dd615ce4cbe3583440f8f8eaef8697ec53a078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ast/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ast/firefox-84.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "237e8ff5b3fbc9d7c4095951ca014a5c26cc076305aee705ca943d81e72541dd"; + sha256 = "910c6c17015632c3f996b4e7732fcc895eb9f966037f53934cb1810856c3e292"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/az/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/az/firefox-84.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "79ca0c798243841cc34281f917aad06c2f546a5e11b443a96e5030aefb8de9b3"; + sha256 = "3c636e6b006c7ffdc01bafcb048fd15de7b414e63968e278a37be8faffa89fe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/be/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/be/firefox-84.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "c15b0f929b3e3c6ad5618ccf6f9f6b143f893b6f77e176b52ecc608ca3157ab8"; + sha256 = "aa691e814c2452bef9cb7f75098ab94cdbe742b3d25c456178badd68169b3b2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/bg/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/bg/firefox-84.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "fd2094c59a057e8c35054f7d09c31699aeef927cf9688a87559a8ba69a93f600"; + sha256 = "f6aeefe5aa099ac804bdd10bdd180d101c634ced146ed42cc025180a6bb9ea69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/bn/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/bn/firefox-84.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "c9755c408ca1a4f426f1432339020ef3d7c675d426fae9d8697cded4c7d493f4"; + sha256 = "91ffef38c34407d455294fd69e93fdb40256da5d06ac6a300cb48902991fb172"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/br/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/br/firefox-84.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "d47b889d31b945a5b768b3bbb336fdc43d62c9cc86f13916225cbfe68a560972"; + sha256 = "d3735936296f33773e8fce3f3beb3a183a5db1ab7d1f1163dd451ffa43bfa0d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/bs/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/bs/firefox-84.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "c36da445560b989ae9cf16a1ec72cd2cae82db670f90d27abe0499f8cc025eee"; + sha256 = "a2fda7eed9a3fabb46a9e3049c1560f486fabf426a868b083b3c7d11447428ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ca-valencia/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ca-valencia/firefox-84.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "ef5ee80cc0d6b1b299bc8bb6577b8e26f5de8b541530ddda231e2fafa863e6a1"; + sha256 = "b1430d43b273e1dbf7899c537d93dce0c0674633ad50726611eb1bbd5397843b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ca/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ca/firefox-84.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "7c349aa7406899835bc9e70893f28c8109e17ee9ef018e7a723085117f8dd32f"; + sha256 = "d06da0cc13e1bbd04f9bb0659fa4745da08d410710793c2dd52086b10ea82cef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/cak/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/cak/firefox-84.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "3e7aabe665ce423bd47e7d0474039d7bfeb9958849c18e98c37f28def5fae1aa"; + sha256 = "66cbce52e16178231cfd884e88443f4d5825079c9df74a3f6ef5ad226ec87025"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/cs/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/cs/firefox-84.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "97d5e4c255fc87430751c81edc62186e1b4ec901ccf17bfdad7a8ef918077bc1"; + sha256 = "7c3243b48f437ac0d95de2f819f6088d882c52f09e74f910f8c7cd21dc57b7b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/cy/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/cy/firefox-84.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "c1856b51dedc5788b40671faee8f8cb996108eb514d1263de998043377f2f7c2"; + sha256 = "9bda66606c45b90de3ccef2c51d3a26d3456e312d145906070923924db2ee58a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/da/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/da/firefox-84.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "990da1f47d04ec9200d41fa401b23d9607a8e4c11d7cc78989e81785b9633cb0"; + sha256 = "13727d086205c7ed560af7ec5fb4db2025dc24e327ad20c55244d9bcd0d54627"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/de/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/de/firefox-84.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "94ad875d88a18f24ae38f20b324d074a367969368e660ea2b4b0645e31300c94"; + sha256 = "50167ebb8277c08d6c13c07c5ae871222ded9f42295ba7604836ac550d3890a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/dsb/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/dsb/firefox-84.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "c3edd46c44bae1b00803e587e6f52560b28ddc2fc935c1fe62714bf16fa72d80"; + sha256 = "62b96a0abcdff8e1299c01fb3ef1aa8de6bd895adfd20698b52d0dc2522c0160"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/el/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/el/firefox-84.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "3572a260ec17f76631ca627747ed53d1911ee1180d3e574051b3baf0afd9dcd1"; + sha256 = "6d22ca0a28bf6c752772b778239d42060ca2a9ab97f6f82c5f88a53f717d3496"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/en-CA/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/en-CA/firefox-84.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "e3c9363e8b93c625234624ac5c3ab0274055c5b8f4f854da955409b9bdf28d52"; + sha256 = "22b40400ffe16f3bc9e9a720170f65d58464b0f0e2ebaf9fc3217edbab5e1fa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/en-GB/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/en-GB/firefox-84.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "240a732c034bf2ac286cefc33b02b56df205c4e175457cd84adb7666418e0be4"; + sha256 = "169edb75ae396aa19fee5472731ada83faa351a2fa0d4d291cd394fe00a9b92e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/en-US/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/en-US/firefox-84.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "93ff827fdcba92ddb71851c46ac8192a727ed61402e896c6262943e382f92412"; + sha256 = "077cb7a8954ad544692a03bde4edd31751e1a819bd229413e35508984abee5ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/eo/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/eo/firefox-84.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "456933a6c1fb1e6ad5b2217a7e3730bd54ff037d3d718414b2c92557fea3659d"; + sha256 = "619667619bed6f5bc99b373e779af6ec98e21218e0d0d2b0d703cb16dfb1f171"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-AR/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/es-AR/firefox-84.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "040e8a4a74b8bc77e1d485c3376690f4c5ba85015b360f679ceacd848b0ca574"; + sha256 = "e7ae3b3415db29b8779f69ff557409f64ed7f031201c942cbee2fcd0e08abbb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-CL/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/es-CL/firefox-84.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "80e8189ce09c736af1d9927d4943e08e30bc70e9aa7e116f150f14c0dab3fb15"; + sha256 = "7948825f75236751066a96e793b159538ee82c2315f07b9972f2204d27bd763f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-ES/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/es-ES/firefox-84.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f48489abac5358a10d8ed36b77398493b6a9189a8327bf61bec6ceaca51ab696"; + sha256 = "3f6ea39596f93e5625d79ba544d9f476158757931f3f7c59bad85d169ef99ccc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-MX/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/es-MX/firefox-84.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "0d4805b30f05fb8a65b81a42337a8a3732c7664b322557e844929d2b049d0111"; + sha256 = "aa220edf6cbf85e7605a0cde21fc7871939501a8459295b2142e4507e8699cab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/et/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/et/firefox-84.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "eb4a463b9271fdde45bddad28ce871953739b55126ae5613963a69a319908fb2"; + sha256 = "63fcb11eac26f26721d6a60c1001d867bceaa21eee2c81efbea8e00253412082"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/eu/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/eu/firefox-84.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3a662c575554d3a542e65950352c527cc51e82ae7a8f9d7ca1b69e30a683731e"; + sha256 = "f49a421799e0691f475da2419ab786ac29caf67ed7413cb5b3736d7961309d17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fa/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/fa/firefox-84.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "b5ad3a5d39674d60b6e97cd656c77d7d2fb90943a66a590a29e4d42ec1e18c42"; + sha256 = "ef1e5342a658923452bc839258f292619c2edff304448ab9d85d9215ace907d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ff/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ff/firefox-84.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "2db83d638474186f52fde5fe1ee25201e84b198e44397074203d7ce50e23e74c"; + sha256 = "73ff19b083e8d8d6ba6e5ed1efd27f18caa9a285fd02bb27ae01190245eca577"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fi/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/fi/firefox-84.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "98bd9c50b5db43bf5fcdc829aa295975d3ec106bbc598fda3d7f26679c0ba08c"; + sha256 = "c576045a05d15ae4c8d6c82fd17036546825f9be1675197a1296a7c8d431992a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/fr/firefox-84.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ab3427f5cf7cc88d5108b8be21806197420bd775f33d3f2dc983f0f4dec44d5b"; + sha256 = "428270e0c4a3d80d810a106795986f2680c3e55faf7fc975ebf56fc90c0ce797"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fy-NL/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/fy-NL/firefox-84.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "9f21d91d1529a05a2da7ba29cc8e875b23ffb4b453077b5e899133cf31813397"; + sha256 = "0e272ab1540690cd688561b4efdf7429298ad087b51afeb1b735f8b7efbaae28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ga-IE/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ga-IE/firefox-84.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4c22b166cccede0bcea4e75f826e100dfa4f2def01f904fbffcef789d2d61695"; + sha256 = "99e5381bfca90d1ebabbe00df75da91901f113ecd6e2aee1b16b5acef91bfaaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gd/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/gd/firefox-84.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "6ca04d381205121dc695dff78ff646499a21976ae64c110763845eda0598b414"; + sha256 = "ddde6096a541ff100d38929cefa87c93128d10131a4cf42717e9a169b5f99caa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/gl/firefox-84.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "d08f4ea821af5e38c21364037c17b8c97c775d60f0697eb0817dcfc7c6d4c7dd"; + sha256 = "98019391cc205449df19365459995d9711a1f73e94db226d7ae8c2172a14c8a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gn/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/gn/firefox-84.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "90a8b2fdf1d3471311671761e81637d6771a61744eb480c0788cf03d295c30ee"; + sha256 = "ca5a642179426bed73c4e3ebfb66c287ee57b3cbbdb35df35b1aebc024c9c8ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gu-IN/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/gu-IN/firefox-84.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "bfe65e5c9795ecdff4dc947d2e2e84d01da894b0ae55c08d73f9397c5730ce17"; + sha256 = "2c4f645de88f4db3a2274a67876372baea53e3d0bd275d6d67ef60ed2ced0ca4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/he/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/he/firefox-84.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "2dc01c5a929aa79056a66feb522d50cbbb567bc85589f8106e553c9ddfc02a7c"; + sha256 = "f2e5ad70f26d393562cf4e0c3743dc01b1dc4ab9f77d88f92419acf8072d3ff0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hi-IN/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hi-IN/firefox-84.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "ef2a61dce3ee713a4be3cee5a9dda8498095a7db69304a7d6585ac674970958a"; + sha256 = "368a469ac2b44c0cb23adbf45c654ce2188e2674bc526a106f90159fdf35224c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hr/firefox-84.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "ab8357cc1f36965ccbd6f4298ffdbb3d77b09cc4b789a3be708d2c51468402bd"; + sha256 = "4cc283202d36f691ed24e0295a9edd51369c996f4a6782ea2a38b57011310dff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hsb/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hsb/firefox-84.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "6a34074a96be7911672b7e83151244f1f963a8cc8930c8d1d113afe8a49c9529"; + sha256 = "cdce15a29c601de89923f77b334ffacf2e2f3474e054499d03aaaa95aa4285c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hu/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hu/firefox-84.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "ffec1646df872a757b771a03c00e3e6df3397e7f4af46bd1d6c0fcab242b1721"; + sha256 = "0def021e54c67a80d5416cff8da4fba48b5d47f1d8c6bd673ac2fc7a64200116"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hy-AM/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hy-AM/firefox-84.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "1b9da538ced466302584fef4ecf415aeae5bee51a87d38bd0a6bb3ea155af66d"; + sha256 = "f6a3cfbd4490d2d0cbc09f3ac15f9d723d485c64603549adb8a4c33d5af7823d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ia/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ia/firefox-84.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "5f8582508155f858c7e52e623579daa7da1aa77bb4e41c2c46d3e6ae8ace6b1e"; + sha256 = "69c93ac33a54358f1cb35204b5acbf3a818a4031737aea44684bf3bdadd93acc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/id/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/id/firefox-84.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "e5690dcc6b933ddbd27fcfb22f8ab9fc4e4c999d935b6088da38c87af2c567d1"; + sha256 = "59236a0a6024013e7b4b21394f66a9d2b3ddfb27ce54c37a227127defec2bc09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/is/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/is/firefox-84.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "3776fe6aad623e9b74807a48e105d1619143e78e122906360c4efbc73c2891ee"; + sha256 = "f13500ac51becd6cbfefb43cd98d3a6530dbb92bc88ad15b1714af775bc3e1c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/it/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/it/firefox-84.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "eb54c4596602150c619db6d0d5572a59f7d9c4def68a34cb874cbc6535939e2a"; + sha256 = "77beebceeb36f1eaa00838f3e3739dd9549a7a02e15bbbd83454a1e86bc83c9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ja/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ja/firefox-84.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "54b70bef0507611ad1ea7560668b46385661b5275c7a0ecaad723db44fd8af88"; + sha256 = "bbb98b2bad26a554493d9fbefe1b4061f14dacf59a14cb8ccd92e728d906a676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ka/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ka/firefox-84.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "56e72349133297d61dfdec4933a01c2cd8fa3d0da3d784e0598506c2db05938c"; + sha256 = "20fc38d941e3aba6017143ac6865a5f210450b773a9d50c195a9b951e65ccdc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/kab/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/kab/firefox-84.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "45f554342449405990c84e910dc6436489046acd00fdc4a0ddabb4b28d7c1284"; + sha256 = "003d7d9d1f2b5f958e29168c698568f6c1e2c7c5c1ec652fab6f2b824828c0be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/kk/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/kk/firefox-84.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "3463c4ea5df4e072dfca22e8983fdc016adbe2326bf186a0168ea9ee2c36b3bd"; + sha256 = "e16d8e9f41fbefc2b863978627eb66e1c82d53a9dc4b1acac912309d633f972f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/km/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/km/firefox-84.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "3bb7d2c3e5278d9c51b87d8140096ae01532e99160b866164d1920fb012c085c"; + sha256 = "e75aa98eba7a600e459e25b7e6d1311a00c16ddade46eeec18ca37b799e7a492"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/kn/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/kn/firefox-84.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "c9086912382dbff66045c79130403385b9f075bf782220aeb84f03f62a563638"; + sha256 = "282f240fae65764d4e1f5d5e3e0ec775ebd66dab4589b5ae9f34bcfb81f50996"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ko/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ko/firefox-84.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "6f70169cd58ee1559ab224c3ea6f5309bf75267d9f315e389b7971e8e1feed09"; + sha256 = "2b5cc8a136b703db4fb59a2bf8ac24ab39416ff44f35836ff70b93e378727706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/lij/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/lij/firefox-84.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "0b089e6f7954f4d99e9e59bd25148c4be620f9486f8d36c3db68fec5ea700d94"; + sha256 = "4cb13be0d090d824b4b86e28f9c02d4c0875133603dec7a58b83ae67e86df30c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/lt/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/lt/firefox-84.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "b76c545aad6e5b66bd8ab34bf02f7d4f69ecee348381b16c271f4de0243c660d"; + sha256 = "b6fa373facf8e8d4a7d4bdb97955820d450748009becf166c33faf936fd34cc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/lv/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/lv/firefox-84.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "8504d5c00c5569f008b2e308a9193cf62130e89a6e61b33fc842081e4d504322"; + sha256 = "5522a451edec23255b2a8fab65d2680e9b3854998290a7dd33183238cb17d33e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/mk/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/mk/firefox-84.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "636a421f6238de1fee37014c3af147220af6a1f3c04e2ce6ec9dd17898bc7c20"; + sha256 = "d0d96241bcbd32e000094008263a37543dfd4c5955b116f88118daff11759e0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/mr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/mr/firefox-84.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "1e00d369be11ad8bfb2dda0ceeb3b7b516fd66427d9e85bff4cc1d699ff3659f"; + sha256 = "06593e4a56e5f76ffb765b605684349fbf31c8a0747cc90ef991c532df38d411"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ms/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ms/firefox-84.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0590f2bff7e43b9f6c081d57276299f8327df73415a8e2a2243e3c4ec9154200"; + sha256 = "ffa6d0f8534253c5ea94df7aba31a06cdf9e294500781d25a31b8dcad15d5132"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/my/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/my/firefox-84.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "ae43f0e8d4ff32274b25a1b78e0af44446ea6989edc4eb3c0d9fae36fcf80908"; + sha256 = "dafa195bca8536709110ecda82e988bed254b145f00581561b18827fa41149d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/nb-NO/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/nb-NO/firefox-84.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "9c3a74fc7670e2202be1f4f75208f0113c115169ef70614af631cf16879e081f"; + sha256 = "9a8e5175bb17ae3110a4ba74dcc575dd4b0fb44981f7152cc521ad017db7e2a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ne-NP/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ne-NP/firefox-84.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "d830f802cccc7351a447fc59ed64562cac1521d281ddf218c84d1c9af8a65cb3"; + sha256 = "4c2081207cfbc657d8f6a5ba781098f11adc5e159414036dc8217874a2c2d8b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/nl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/nl/firefox-84.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "ecfd03850a48ebf7c3ec9400838100514826b8f35744b0167f61c9086893ae66"; + sha256 = "947dc32c772a2205ab30fdd6d8bcf938642e9d734b58829d2dec5a1896ac6b4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/nn-NO/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/nn-NO/firefox-84.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "ad0e4a89afabf1929d441129066dfcbf532d37da31c76bc79108d123cf5cc649"; + sha256 = "89096b5f2ce27ece10be949b495aa41cd882bfb4a742cc3abfc66f36130313b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/oc/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/oc/firefox-84.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "9b9bbba334c4d7d3907f55a6647cecdf0bb2cd6294569a0008d866cd6eb70a35"; + sha256 = "50f603507e5d276c5f3237d1554269faab573d8c194a488353227743b677ccc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pa-IN/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/pa-IN/firefox-84.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "083266958874618042ee8f2a6162184cd71bc725a994aeb68158d59edb0cafaa"; + sha256 = "231739c85f20014f50a982b4ac0634a8a4147cb6de5ba39a9a11a944d4ff80ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/pl/firefox-84.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "cb7c72fdc91cd9269a2e53725a26ee94db0e2e608a60ff1120fbe5c1627814bf"; + sha256 = "9487ffb5fdfc2f7040a7f9bf2585af324782e2f3dfa996db719103b20d02bf55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pt-BR/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/pt-BR/firefox-84.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "a2a188a222fc6054ca59d24370528e8c8d4d7dc8e4ab18f71510b415dde73d05"; + sha256 = "fd53dbc5724968b0bb2c2b78de96f3708d05758de63aeaa7fb942f9b64a0649f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pt-PT/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/pt-PT/firefox-84.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "528e1893438ead94afd4013d3c4f4f51107a5d0c4b6d6e018a0687f0d25f9e53"; + sha256 = "39211dde1b183c0453643fd6253fe6eea4dcf2b006842b1cd61e1ce142991a44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/rm/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/rm/firefox-84.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "e4d6e53b642da4de5c7f30297c6fec22b37921a55cb744962dc0d60e26812549"; + sha256 = "29cf408b9386907dd1e8a64f56aec2e0359de243c3d17fe2531c0f1c7285c205"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ro/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ro/firefox-84.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "04ffa3eda69ea0dfc6251564c4c6bc742d5f8e5dbaf6184b4ee9461226ce5c86"; + sha256 = "eced9ac8aa417dbb5dd725c952eaa977eca1b48a7271e9f8dcbe1ee46a4b1321"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ru/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ru/firefox-84.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "697ddeb8ec024b5459492ebd652a612cfa1911267071b230f5ea6ac78a1e3075"; + sha256 = "7abfd2a2b30eb7744d890ba3a0589ac5017a9536c43fe3e154e60339d7b41544"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/si/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/si/firefox-84.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "a3256c648ea75ce36009306a3c039af228e645ea2e54361fe239ad0cf0869ead"; + sha256 = "e9e8c21b64f7f434db99b30b6e7190fa55f3b23a63dcdef120118d228ed533aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sk/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sk/firefox-84.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1ae0f898d34c74ea427228d93646ae47990834d14bc4f5563427409dba066f8d"; + sha256 = "dd2e17cf612de02aa71a933a8b1f26e403e1be4da54e63530667e81441d5f6e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sl/firefox-84.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "9e14b4ad7bd9a8026074e0a3da3d3ba74dbb1be31a2e9cae787802d090c7a965"; + sha256 = "782e612494aa907990262c7ac7189e98d90336b270a806a8e191dcc1c8266218"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/son/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/son/firefox-84.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "1b928ca974133a346950ffc663fbed9d1876a4c0bca53fd807d8077d031531d5"; + sha256 = "7730614e4e22eb871dadcc13f62d0d2bc445aed89c1ab6eee2600aa6f7023fa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sq/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sq/firefox-84.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "7bb9bcfe490bf5d577e55e9b612c932c93ac58252cef592b2af39c17987e700b"; + sha256 = "6726cc2fa9c7b40e92d512b83bc0a974c3668a3854ac91aafa334b4d30b71ee7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sr/firefox-84.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "90e496a5fe9c5d8c38dfcf5a1a07ea04be983fe78c68cb13a2b99067b0f02e7a"; + sha256 = "22b443987fa62f4d753efc04ae926e3ed69ce84c56a2fc653994d886da10f9e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sv-SE/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sv-SE/firefox-84.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "eab8a1e51a90d36b58901db6175e724f38afb91270b05c51a93c03f8c51fe432"; + sha256 = "3c4d26bce8cd12a6531fe15e3e7251ac9046bc7d1670df3754f0c379bb63ef50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ta/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ta/firefox-84.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "bb6d49500393d20134a6f749a77de1fc4cae2feba4e49261862f8a634b4b9276"; + sha256 = "edbfebceb857824f331c46eb7611dfa9adbfcf6cc7b80075478059261b0de6bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/te/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/te/firefox-84.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a1104e292f949976e423b587fe9728fc741b7a11e276e7d747afd3a93abe3eb5"; + sha256 = "06f342dd81f0ff481de67fbbbd5bbbefda27629be688d854a226d515c872d69c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/th/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/th/firefox-84.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "403e4a86b5f95cb22cdb2100372c55d92fcb4708e3f719da72b643637c711458"; + sha256 = "1ccc1da981cd49effc811b4dd85a09bc584316b3ff50fcb05502e4618c465ea9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/tl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/tl/firefox-84.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "993cf86a1b045a477fd4c683e503314fc2aea5a0a52f1faaacd18a0fdc5c7def"; + sha256 = "b15095bba6ff763f01e7677359a0e8885164eedfee1836e0eb4e1822322050db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/tr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/tr/firefox-84.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "8e9e96d0b1a2014dc7374ea893fe72bc72f3840742d305a6e73417468dd6245b"; + sha256 = "e140a2196da9ae934134bd3ad3dafcf8766aa676f410047817ba01ab831b0ad0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/trs/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/trs/firefox-84.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "3590ebb4c888cf92ebd615df9eda2413fd0a3031293d68809fef74fc92fa759b"; + sha256 = "3a8c6dd94d17c8ce892f7eec395f8f6676bf4fb18174a6dfadde41868f9d3e21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/uk/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/uk/firefox-84.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "7a3a2bae67ddd2afd2d6953f5f045a831595ea29e5cc6ad7083b8ac89e55917b"; + sha256 = "d66bcb1f09213c34f14ec0cbd3687d8b5918afceacb2164e81ff94e681c432e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ur/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ur/firefox-84.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "445a599ba623d8673d71f6ebde70c64a93e28e57b6859e325b0151240f1d49e5"; + sha256 = "0d9094f14a25b0bb3c7656fd524cd330c0b7a6334ab23c86a01ecd1beca14988"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/uz/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/uz/firefox-84.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "b63e6c1c6afdc3694ee1d2b21175f4a5603c4454e43f0a08e87ccf800862b6bc"; + sha256 = "70d3cf8198442718cdb664dbd832c91d5252041fe1076faa0f790e63f0c22771"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/vi/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/vi/firefox-84.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "7127340d189ff601f96ba6f5e6a6175d850e822599e10762908d406b2174a256"; + sha256 = "17a0ee2e12c74e73fd1346257ae5f797c866f0c4081a154f6290e73f4be40f27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xh/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/xh/firefox-84.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "41772e457eaf385230086a461033854ad214b4160c6f99f7eb6c4df8dd137dc5"; + sha256 = "7383a176b5afc8319781586ece3eba752739499be2c6944050b57ef5b7b620f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/zh-CN/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/zh-CN/firefox-84.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "013fe88aea216fbc4de9fdaaf559d65678ba389049bcff896540dae8d0a9564d"; + sha256 = "08881c7f4043a6e4bac11b4de388da773a374a6c83068723318ab6e1eb981fdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/zh-TW/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/zh-TW/firefox-84.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7e9eea2a326842f652aad4995f796af9550d03c034587d171e4b2a33da934645"; + sha256 = "ed3bb049a2a80cf294b4b4c4ca0e980b38b6f18c4e931a63ff78e5707fc2daf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ach/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ach/firefox-84.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "9974b19f4f15d9aa33b5432cceea05efe44f31c4123596aca9fb5cd3dd734152"; + sha256 = "4bdaa5921976290cc5bb11f981d2f6559751a693a2bbe512b9e80eb5148b2e37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/af/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/af/firefox-84.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5600ad5fad398648d2e7a2d7bdf7901769fa428f9ef9f79046917133e12a7eb6"; + sha256 = "853d005f8ac8e2e5e31e3a24057b458f1441d6ac97a41f414c0831295b91fcd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/an/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/an/firefox-84.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "d8e0843dafcaf1b010773b83a665fd593741858b60aaba61d4c308a86f765146"; + sha256 = "6409ce28faf1dd18f079891e373a61f0b1eb730b3d1c7559a13784192367577b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ar/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ar/firefox-84.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "952b2ad360662341b9281cfdd93a141fe2efd16f73baa4fc4be1de7b8f12c8c3"; + sha256 = "9c9da9daad627f4c5dbe5588667cdf90fe8a582adaff962c674c483a5d80dd6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ast/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ast/firefox-84.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "a7728b09f7e96983a031a32b1b938fa362e1a1e58722b37ec03a4048a152f0b1"; + sha256 = "609de4719323b676dc1a15da8d0295d3c67bb4ee271f70f28db97dacaae87f4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/az/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/az/firefox-84.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "c6019a3f7ef56583445acc5ab310770c937b44182a1bb3ed54ac452e6e19f8fc"; + sha256 = "f411a4a560d1a6db4daee06ee3a29d6a14cb5e6e1914aac54c19918b93569e3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/be/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/be/firefox-84.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "12ead04878e308682f04afb6ac9ce9ab134a5a542af328e029cd973c14fe7444"; + sha256 = "46d73bb13f113dd6dda069ba571e623b3f20f2b6e76f55f307690ee01eb4dba7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/bg/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/bg/firefox-84.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "7134539d5c259cdf6dd316205b857acae87730ca01bd6ef2efcca75f9d06d027"; + sha256 = "0bbab0465efeac3cc3f72749242310e1456dbee915bfb08b7ff7e5f5c2fff0e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/bn/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/bn/firefox-84.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "a97524e0d6f6f61045b2573ac2fe98e31fa372429f5f53c25fb4cb4d32a31940"; + sha256 = "c1d47ac9ed0e01a0ec77776bb6131ae38faa17a3da2d8bea723679e3cd158074"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/br/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/br/firefox-84.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "4619705703a6878fba4de4227d90143abb92237ba556a8c5f4a51c9701671821"; + sha256 = "b205df6c0016b2c3984b33c00c2153688c7ac162df1a3748b23ce081a87d46cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/bs/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/bs/firefox-84.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "2131babd061761fa1119a536ae354145315875c5d8cd300405a35924bbbfcc34"; + sha256 = "85093f59d815cc1d45e6aa6f8ea6ea2972102248aa4973b4386e265f985c85a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ca-valencia/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ca-valencia/firefox-84.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "73238eb95ac828f4bc2ac220e4b953b950a75b88600b457bf3bd528245574cd8"; + sha256 = "57b5054db2cb6987db174c1a32c5e87bc37f1de3ff3e1046421962fb50204af4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ca/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ca/firefox-84.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "73e65093a587c89c9a392e3b65375ad2158c88e2905ab116eaf8da7cc5841cda"; + sha256 = "f57a9469122e99537dfe11984c11425008d81b738fb939297be2c1104858d52f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/cak/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/cak/firefox-84.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "7f2dd3fdf1e0cae21a1517286b60bbbabd310dfc0dc18588fbe21ba671e97dd3"; + sha256 = "6a8d4e9b3555ebb7020e347bb59d426fb5ab0cb1fb5012fdd99d0e978675b994"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/cs/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/cs/firefox-84.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5f639cc6d14b06ae62f73fc01b909182efea32710dfd817be60499f4da3eafd7"; + sha256 = "15d8e1ec0e3719228cd0d4f17667a08d4fadffdf2cae91abe47ddfe511d81046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/cy/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/cy/firefox-84.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "7a3e9921b2e6e407ebeeb22f1ac4b529222a1f5fbdc84c44fc902b8db6aeb1ef"; + sha256 = "412d19fa8e4c47c892780b225e6d320bc24b3adf482cb023964599ac35350433"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/da/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/da/firefox-84.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "05dc3274927f692ec3c60f8353a30e2bcb1a36b54f4ddff90407e2818a497a38"; + sha256 = "8116eb1c33d26e589c7cc3b7999159f7893018f7bdcf627d9b892b0f96a55e9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/de/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/de/firefox-84.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "c95affb4655b7a0ad6959651cf10090970035c74601ea141366cbb5d44f8a526"; + sha256 = "433b02ea3b1d50e9a8287e6e264d518520f656fcbb9851068de1240599e4c512"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/dsb/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/dsb/firefox-84.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c9baf7df51fdebbb2521dd10830f759110a9c92dcdb579fad99d0c4112126e66"; + sha256 = "5d55fdf5976a0c1f3a79058b1993923ae67c063b6643695dee8bcb4faed06c74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/el/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/el/firefox-84.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "52afcd2037b9cda2c66975dd184276bcccca27833cd7a6da989e32c591a06060"; + sha256 = "668a9f735be42cdd57a8b7395c37703e6e1b30264aaf9201a801efe711dd008e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/en-CA/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/en-CA/firefox-84.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "375d3a11f236560f06397f157209b1ce476197a0e7b327cf187dc2002d053c90"; + sha256 = "9c20e6c096e1a7ab910d91380083e400f35052ed9ae72860b8ba66ac750c5fee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/en-GB/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/en-GB/firefox-84.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "610657a623b5680c2ea350a5f3d1ec676e9dac8720e0e67b3e627e37a58b0ad6"; + sha256 = "4de8ea0ba0e599529abde78983e04c509229bbae756c633fa929833b385f9519"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/en-US/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/en-US/firefox-84.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "ac4df9d78ac0321f6be266e7fbf6b79d80bee7cfdf1b00c433072d2283c5fdf8"; + sha256 = "6cf9fc509ef21c004a70810c8cd4c428593642edbdd5d4f4c455345391ba4def"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/eo/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/eo/firefox-84.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "f23479cb30cf27fa368e9e04591aad2051eedde5e69d105bfc9ba6168792b44b"; + sha256 = "1ed7915f1cafa19d36465bb0d5f9fca8e57b7f0f8652dabcf90a4e232c0cccdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-AR/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/es-AR/firefox-84.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "5657636c105d301474cf5d2707733a35ac5f5687790002d5778dffb32a727adc"; + sha256 = "359234b846e364352a6af0a262db06b6e9f4a911c407bf35f1ad2f8460eff7ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-CL/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/es-CL/firefox-84.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "896f2ac45b98eccd487de64b6c5aa98733d97bd4422dd1a16d02883e3a06c132"; + sha256 = "eae445daf305820692b7ee9d20dbd69f0da509716925db6c12eb7c2e7a521416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-ES/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/es-ES/firefox-84.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "9d337fc821dae150c4f3ce26c427ad0efa22c53f3b311b4ce7693b33c9ea4d7d"; + sha256 = "36a2f4eca19bff55f998e8e36718d4a4bdad0eea5c53af1825f857834dc6a1d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-MX/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/es-MX/firefox-84.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "f9cbd03f9813157835ef7faf9fa2374e488144930ffdec765c370a95a9c72120"; + sha256 = "7f7f384bbe156e37af25cdc19a49ddf225692a2579ce5c7df37b8684f0318102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/et/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/et/firefox-84.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "4f33cbb67003da1b4db4dc12ee2e7b9fe942bc6e6d770608361355ce7fcf8214"; + sha256 = "39288f46064d259f4ac1f11481480b189d945608d4b3ece922b774ca31fbf95e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/eu/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/eu/firefox-84.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "31970c98d028a83a6198dcee9c5f8191343cd84ec6a7fa032a31730db2cc7b00"; + sha256 = "7693f969f356f87db5d48266ac20a152bbb8946486ee60f5efa0225a83a25493"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fa/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/fa/firefox-84.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "1125c534f2067e57701fab7ae3df55c52dc10693b069817021072c74b8b9bdcf"; + sha256 = "ff189730d71b2ad0e2694a364bc0c0ee4de50efe30f44935b1cef0d89488f8f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ff/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ff/firefox-84.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "ef6c66b0d8a6edce0c982eaee55cd14a4ac4d365478976a0c4f1cd48a6c10c6d"; + sha256 = "b6f39b27d000fe98510da1d5be6b591e3a7cd1b6e2d2502bbe7e67b124822ed1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fi/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/fi/firefox-84.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "bcd529c0227bd64403dc023ef91459556fbb186e072c12075b705d50293d86c3"; + sha256 = "ec33e3bc8a549c1c2d5bdc0f45113d96d3c959d1d9232d08417c09821cbd8e42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/fr/firefox-84.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "47c56fe2b88054d97622e9c0ff2043323b7a916da1e11541e96cf7b05c3e7d52"; + sha256 = "43e80f221e53db14a57da940d6ad98d639bffc94c71e08ff39501aafe319c3a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fy-NL/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/fy-NL/firefox-84.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "b0ed17e5022b0817d6b4f58ef990ce22774bde875151c60be1f7251ec90cb189"; + sha256 = "dbbe3af347ec5e8e856e4580889f99709231eb07631862ad4e8deb095f098390"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ga-IE/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ga-IE/firefox-84.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "380aad276cadff8221e4f675751278ba994e08ddb46a0ebde12d87b741c23263"; + sha256 = "4d5c8fec2f370840cf79c19774976585af0d8e09f13abcb4a594f3ebf9c52558"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gd/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/gd/firefox-84.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "0489ed6e1e9150a0facb4e6fb59bea7673e89669d167806d5651224b939fada5"; + sha256 = "7ea8febc7443e1f7c732e07cc8bd027ed0a82eea018b6bf7c5979820821701ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/gl/firefox-84.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "bc41c2b611ecb4ccdedbbf480138a3bc6326106d6c1641d6a06e40f502427af0"; + sha256 = "207dfe2ed822245d089a4f1848fcf6c92e27715b4463bcdcdea2127e8ac8fae3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gn/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/gn/firefox-84.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "ade8fe9ab75b0a5f75ce80ba0f8065c4b4cbf54d7772f4c3be96886ca166b373"; + sha256 = "a07d734191885b4e5e66c1a5b2f64cbdcc133dd9a1cf8fdaea882a3a1ceec7ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gu-IN/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/gu-IN/firefox-84.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "bc20ad60eee0e6a3d532e436d9b62175872fcb27dab4c9a5083ed6f4bda5f036"; + sha256 = "af4146f86e4f5aa81d10067e21653e657620d9b0b51d564dca83c4435f6cca82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/he/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/he/firefox-84.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "a08862d8ebdfa2d6c4f038b91f264c9abe873537d1a7cd2997a1eb4d73bf6f4c"; + sha256 = "608652ef032ccbd0d61070a32a2931764b86ea0d25afb12617338136f3f29e42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hi-IN/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hi-IN/firefox-84.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "8ed5b454bdc38f07c79924a1dc08e76e65a48bd671991744a441693185683916"; + sha256 = "1724879537c0472762dd93a2206f31767938881ab4113946076205342f8f5f7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hr/firefox-84.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "97356a661d56d51a9210109db8ad75d61e3e00e4c7570d4e824712b52337af27"; + sha256 = "727f4a1d3ef4e531027c5188798b8fd1aeab98bffe4c1f7f67d919aa8855e6bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hsb/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hsb/firefox-84.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "5706aa76b23161baf24b79d2b45dd706006fb73aeedd06f41f3273f8078f371b"; + sha256 = "6efd8dd2cf6f82b688632095a16c5e488578ac08227cbbcf2613f9b2852c9445"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hu/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hu/firefox-84.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "3b894beaef35012df54ba4c7509a06ece1a0cdf741308b3510ddc702c4eb3656"; + sha256 = "458e8452d89e61f8f4ac3d1ca3e41583fd26cfa897c4b36e0888a2174c853508"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hy-AM/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hy-AM/firefox-84.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "b2894092de59b7d6bd6dcd2111fa4591b1a4ed054fd107e2093bd0962edb4405"; + sha256 = "b58af31a6ab2e224f9f50e88c1e97c8f4af273f5189c59f025c10d5589fc2d41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ia/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ia/firefox-84.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "9d9ee7e05a02078b7d4041c3b63e79f91f0a888b919cf726e2e69090ff05f71d"; + sha256 = "de6bab3cc3e08fed14584d57a58b9310829ce17906561d880c06968d3ca6a879"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/id/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/id/firefox-84.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "13e54589a23323e9043d4dac5586a31e5d43bdde0356b1a00a86f91ee5813eb2"; + sha256 = "31cd054f01b8050fe70a95def464b76bfddff2277993c759395e13c3829c2c70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/is/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/is/firefox-84.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "955a8a4ff1c5ba7124593b3c8537201ffb1fe33ea5c3edd6ab30e80e6b28f60a"; + sha256 = "fbb17534672c6b7c89dc51eca97ac9c0f807fce84a68bbf75f077ce1c6202725"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/it/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/it/firefox-84.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "23927419191d7aee8b29da29d213ee9c7ff39363f3fc9171c70d801158cb895b"; + sha256 = "9fcfd33025b3d7b88238e6c51472a06b1b6bef56d1275a1aeecb66224f8d6d9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ja/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ja/firefox-84.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "4ffaf6df345922bcd82942956a0f344c4b52ac49ec64879fef7307a0c34eb8e9"; + sha256 = "37a234db4a8618cb125215ef51700fe72e29f2ac9328c4f5a319516f32eac7f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ka/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ka/firefox-84.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "df1027754efd054bae379b35228067799e75820b08ca7e6aff5a527fdaf046a8"; + sha256 = "0875616e42bb71c79427a31c5adac9e1d9112c0bbeae866725ae9bd87ca915f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/kab/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/kab/firefox-84.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "6fc1e5d662ce742a48c003145b1b4b58cb296b43a20f718bdcffdc05e386078f"; + sha256 = "88b6430577c73965bc229cc2875b138db1cc47ab27c7aed6c6004559f296d819"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/kk/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/kk/firefox-84.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "52cb3ac3a33da1227c3aa5e47e04620be2cc020bc520fcf013fe11ad74ad6378"; + sha256 = "6de277b39e76394245aaab0dfd4ccdcea4af5812fce20ff61faf9d62c22bd34f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/km/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/km/firefox-84.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "c598fa97bb79f56d01afb30caeff29a2c7dd1f162d2fb49c0632ee259d0fe860"; + sha256 = "25c0e6752716e6fc4ed02b465b820661ec59ebf997bfaebdbfe172e2a18dc387"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/kn/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/kn/firefox-84.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "d6795f3f3c0978dbc399768fd824cceb6a3c1c883c153f65102ef476f74d6408"; + sha256 = "f61cf632f934daada5d6d2164279981b5536d078ddb5b19e7146a7beb0917e23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ko/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ko/firefox-84.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "b4d0b62cdfd332d8e9878b75918a0362a7b68db0b62e4e4508dfa176e79b8ed7"; + sha256 = "9e9000032c24fd20dd188c9306364ad79fc2d47b3433d36914a2caea716ff230"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/lij/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/lij/firefox-84.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "257eec8bead076119b0c3679feb4f3de34c9cf66bd05215e7d76936e6d3ce052"; + sha256 = "1fd2f5ec8c3074845a27072d8eddf364384e7ce7494739af331a739249c34e4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/lt/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/lt/firefox-84.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "326925d68306ec6e5b7334eb413cff395ce6a27abf5b0981dee25a7888c64079"; + sha256 = "e8b43ae1a3e3cf7d5fb955cfa772f5fbec525fc9c3deb0e81390b8fc53b70176"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/lv/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/lv/firefox-84.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "036264de51a7a81b3d636b8217db571db70631231d485f353e64e9f43f0192f4"; + sha256 = "00908977f480f6829761822a4f6f9800c3940faeac0362c46433813788ce1391"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/mk/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/mk/firefox-84.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "6d4966ae49ba7746395b17b98c158c07d33293b68a6c648d0238107812ccfc03"; + sha256 = "cc6a8e52d7e3940e2664b4659f4a33d452b1bea56d3d53c88c28afd604731118"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/mr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/mr/firefox-84.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "88a90205bfd157fbcb0697efbd4884772a463f776f5110aae9903dbc1151fcbc"; + sha256 = "4a16e203e5b02b146879722a1fe909bd964d712795841cbbd268acc34d5073c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ms/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ms/firefox-84.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "67d3651739404a73f263251896c129dc121808d4859169b3469b640345433e9e"; + sha256 = "2ebf161faa958992d3dbb9f7d70f7df058b93bc0627a4585fb3226a744c23ef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/my/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/my/firefox-84.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "d7e9a1fe6d2e0e32c2ab9a773d198de241ac2a7d330d9eddce4f3afb9a67671b"; + sha256 = "43255bc0c5a5adc89bb89ea9267b3d4b38d7432555c7285722228b174bf909a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/nb-NO/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/nb-NO/firefox-84.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "66c165884d4397db3e420151d2b6fa3d7bb7c6de790e6d284815cdcc323da3fe"; + sha256 = "153783b507cf3ec449e8a3d7db6ec523e956c23e1c01f9e26c0e6fc7547353b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ne-NP/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ne-NP/firefox-84.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "f75832bd74f5ce8db3765201eee058f0386f196f407223e186c0be3d2a665fcf"; + sha256 = "8a3b9e8607565e6031f15a94ae4bcc6e6681d1705408f79483406cdfc04e6c4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/nl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/nl/firefox-84.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "beb68fb193dfcccbe22369f9adcbebe701fd4c9ab5943ec685d5d20398a1ea5d"; + sha256 = "7d87b9188f74dc3f910761fc0e1c493c121ed6ab077a0fcf1c88af94fbca22a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/nn-NO/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/nn-NO/firefox-84.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "de2716b8f4c13c6ef76537ef52f1d0529016302ce220a90d9b5062af9becb5b7"; + sha256 = "5d0177a4c13faa2cf9aa0edacbbd381d1ff5eb9ad17ae44ab507f3c8e582c360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/oc/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/oc/firefox-84.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "af2a788560a65cb9f3d2ce98acce4ecd3b3105b6c924c6a4de1a9deb6f2a4d42"; + sha256 = "cf8cd276252fccf07990c0a294e4628566ff3884cc062f26d6510dc042c6b5af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pa-IN/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/pa-IN/firefox-84.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "a3575371b20bab63a8bccc110343e0cd0736cffbc5c72dd7aa371c646a057060"; + sha256 = "75ab886eb9fe8d0a2cb9b0544090bd4b818e510ae4c3b137323782237d1a2a77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/pl/firefox-84.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "daa554b493ce1efa90a1b040e78d2f2e7ad8ca70c16ee19312c69ed4a12f00e3"; + sha256 = "9a2007a58e264731fbc1691213cf4aba07f360e5c3ee455c6a9abd85078f447f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pt-BR/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/pt-BR/firefox-84.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "4f3fe4a1ce0e12383b37832f44b59fbb40b8fb6e95786edc57ea67ea3d5530bd"; + sha256 = "71b833c745a4fb334fc1aaa250b67d701cac46c3decec7b839e7554c30e4fbec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pt-PT/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/pt-PT/firefox-84.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "c16bcb116b845a6b28b72096ae43d50f19c7b9868c8bbb833db60eaaa70b001d"; + sha256 = "a56ada11b7681238a17c3e02c90122d4632070d8385624b34e03ebd2803328e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/rm/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/rm/firefox-84.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "334d3dcf333a66f4bd169536f7f3b56ba4b257793dfd0837badff2a77b3668f4"; + sha256 = "c0cadeebef45884e11a67e1f45f0b36754fc6e2537b2575f06ec539a43986bce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ro/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ro/firefox-84.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "1e6ad9735fe0046beaf80ac35d0a1831aade14f388d08991b9bc583135ebd94c"; + sha256 = "386f7557754cfb2887c7ff2be165d8b4cdc4cc4303fd26539b2d09de440b8c0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ru/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ru/firefox-84.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "a252bcd66f01375fbc4ce040b89c853c34745e8dede116d200303c56d6307f15"; + sha256 = "62ee54d895760e7a024fc4836096ad97b95b9bc0ca9d5900d551f86b16071aeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/si/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/si/firefox-84.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "ebc5ce83b456f75b671694ac954258ca480caee563e0cb395786692aedf24d88"; + sha256 = "37b2bf998d61de9ee9b372548d8ccc0a2b4cd098e26c7773829267379cf5bfc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sk/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sk/firefox-84.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "28aac94a71298c459f14949c9c82b379762d3192a16d92e90605ab8925cb31ad"; + sha256 = "30429ca6601f9276339f925614fd79b03ac54573564307ea84f0f87359bac7f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sl/firefox-84.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "7fe0eb68a898488bcb697120542fbdcfd1d972c658b4c361bba351a8f5eb76e0"; + sha256 = "412e8aed7694adc1870d4e2bd8eeef74eb63ba0699e815b1d2ec65d38de9b4ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/son/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/son/firefox-84.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "f9cb1327834b6a6e41d4abf531410391a40f33a8d168d562dc367faf31d9e042"; + sha256 = "864e49755554df5ba8d5669f1b3d683517f2eb44039a35097e3acada4b22171d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sq/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sq/firefox-84.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "15370cc0527797f451a5a1f47637c6663437c8f49fc5c056ccbc2e7510cd6c94"; + sha256 = "1449ff4fac39eb2c3f959a899d773e77e457639ebc4cb26dd9c4188395b9c831"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sr/firefox-84.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "c44773c36eb39067e429fb4a4b57676abc7eb9fcf45bd6654d96761f64747c6a"; + sha256 = "51813e4ef930533045632fa516752303430ea9fdb848653c1233ddd9ef6d26c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sv-SE/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sv-SE/firefox-84.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "aa8d2dc50dce8a53a926c71a4a7a57023a017d5fbd54cd1e446ef74b5eef7dea"; + sha256 = "82e3ce190978b83da1f88b175bcf4f1c95a1539e15375c856c54516333b8fc5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ta/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ta/firefox-84.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "5fc3e8a048ec24e49c4c4a0e36712b378687e927c30dc8ecb3ec63bcf983062a"; + sha256 = "09f104627061c25c188d6e945dc1915ac43af31c6a0a0a05e70f051915f3d2bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/te/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/te/firefox-84.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "ff123410cec64c47d239a432d32eaefa494e7cd7fb0157cc45917fe04b2916ef"; + sha256 = "a58503877b476f20e176abfa0ca2e5406b8ae8877954924f63f6490c5be19526"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/th/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/th/firefox-84.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "cb7cbf97884a5b4f62c4e0932ead0e5de018c9623590ac3798a86986916258dc"; + sha256 = "722f4194231fb315a07e0efcc922c6d62a8969321eadfccf2f6b74754b563d2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/tl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/tl/firefox-84.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "0d55a23e2c0b7da80a6c042e50fc3c9364c3f24309cf255bfbe55a320ec2cf00"; + sha256 = "6299ac5b4b505549cea0dd465059191adbee72346cfec46b94c67e7f5e9bc399"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/tr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/tr/firefox-84.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "bfc1adb570f79b4f095bc87ab5a54c6b5179579840ded61319a10ad5ff39d52f"; + sha256 = "3e4755c497512bcb225a6e35e426db6772f263008f9d6c8495a8311d6d5ebfd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/trs/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/trs/firefox-84.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "05b5a2252380147ec47561e29514e3f994414b46aae3dd168909f03e7dec16ef"; + sha256 = "d6bc24f33f73fea25675a1bcb53a40d4dc123b6496f0087c25b4bd7f6ca717f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/uk/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/uk/firefox-84.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "7e34b52f4d46a735e36f549295d0f9704113024058a7d8d69a8ee6a023d03755"; + sha256 = "37b48b8cf2e57a3bacc2d3a5c139ac1d465e246a68fd33b87891e8c844af0088"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ur/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ur/firefox-84.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "1d48e536c09f862bc00fcaf9a175eaeffac1e0aaff66d71ca49123c00cc885bc"; + sha256 = "b3a45eb2ad18d1af426e82163b426ceba5adc47957ff771121ee4b172037b53b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/uz/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/uz/firefox-84.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "1f1cf131b3196886aa0f923c5dbaa279b86c3473dc048ce23d58fe811ca1266c"; + sha256 = "67539a5475aa12d25f8b83655cddc804d46b980e03908bb44f5378753abb649f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/vi/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/vi/firefox-84.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b98507cd809abd28c51514448bf995661dede7c727808ab8c2db46da8da0a164"; + sha256 = "ad894dd659f5c86e0b094b709d0d336516e29dea1d1d9ff35f264e6606e59938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/xh/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/xh/firefox-84.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "73de4ec29cd09610359909ada39820a119a15c3ae0cc1658c2e9b874801a9015"; + sha256 = "a43b653ad3a3d865c410103ccb66d3603a08cc37177d5279a1b326381631dcf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/zh-CN/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/zh-CN/firefox-84.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "fea085476f4456133c1f0973121319f1c3efadcc50134cbf5ccde351bbe2ff06"; + sha256 = "73e877c33aa5553f90ffc0c68b7416bb988477e55f53632d9f78526ca11a89ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/zh-TW/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/zh-TW/firefox-84.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "5aebd374f2e73f83bec4c14239555d9f2771d3379280fc55f90f1ae0909be009"; + sha256 = "7f448ee87156e73cba4a9edcdd52299f6f70ef7660bad9ee6b7c60375d83e1e6"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 1fbfdc2a7da64..70fde21823a3e 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -118,8 +118,9 @@ buildStdenv.mkDerivation ({ patches = [ ./env_var_for_system_dir.patch - ./no-buildconfig-ffx76.patch ] ++ + lib.optional (lib.versionOlder ffversion "83") ./no-buildconfig-ffx76.patch ++ + lib.optional (lib.versionAtLeast ffversion "84") ./no-buildconfig-ffx84.patch ++ # there are two flavors of pipewire support # The patches for the ESR release and the patches for the current stable @@ -141,13 +142,7 @@ buildStdenv.mkDerivation ({ url = "https://src.fedoraproject.org/rpms/firefox/raw/${fedora_revision}/f/${spec.name}"; }; in map mkPWPatch [ - { name = "pw1.patch"; sha256 = "1a7zvngn3k7dg886zmi38kmrsdzh2rrr46aw59bhr1gfmq8wlwn0"; } - { name = "pw2.patch"; sha256 = "17irg3yb2mchcy0z0nr4k65mwvkps467cvvczr10fnm06lhkhw1l"; } - { name = "pw3.patch"; sha256 = "12p6ql5ff2lfzlni6xkpz63h2xr6n2a9zf8hhjl99fj56rif6706"; } - { name = "pw4.patch"; sha256 = "0rvysc92rdm98s47w5lvbnrklrf7d299k3918qnldniyb4b9p4mg"; } - { name = "pw5.patch"; sha256 = "0kk2yxq4qkfwc4px6m08jrn18a7a7dhrngfiaw84r9ga6sgn0z00"; } { name = "pw6.patch"; sha256 = "12lhx9wjpw0ahbfmw07wsx76bb223mr453q9cg8cq951vyskch3s"; } - { name = "pw7.patch"; sha256 = "0afw7cfd48vn62zb9y5kd2l26fg44s3aq1kyg3gm4q3rj34xidf6"; } ]) ++ patches; @@ -352,6 +347,10 @@ buildStdenv.mkDerivation ({ }/lib:$(patchelf --print-rpath "$out"/lib/${binaryName}*/libxul.so)" \ "$out"/lib/${binaryName}*/libxul.so patchelf --add-needed ${xorg.libXScrnSaver.out}/lib/libXss.so $out/lib/${binaryName}/${binaryName} + ${lib.optionalString (pipewireSupport && lib.versionAtLeast ffversion "83") '' + patchelf --add-needed "${lib.getLib pipewire}/lib/libpipewire-0.3.so" \ + "$out"/lib/${binaryName}/${binaryName} + ''} ''; doInstallCheck = true; diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx84.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx84.patch new file mode 100644 index 0000000000000..c4187fcda39ee --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx84.patch @@ -0,0 +1,25 @@ +diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp +index 10ac77b..0125d9b 100644 +--- a/docshell/base/nsAboutRedirector.cpp ++++ b/docshell/base/nsAboutRedirector.cpp +@@ -63,8 +63,6 @@ static const RedirEntry kRedirMap[] = { + {"about", "chrome://global/content/aboutAbout.html", 0}, + {"addons", "chrome://mozapps/content/extensions/extensions.xhtml", + nsIAboutModule::ALLOW_SCRIPT}, +- {"buildconfig", "chrome://global/content/buildconfig.html", +- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, + {"checkerboard", "chrome://global/content/aboutCheckerboard.html", + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::ALLOW_SCRIPT}, +diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn +index c83b3e2..d543140 100644 +--- a/toolkit/content/jar.mn ++++ b/toolkit/content/jar.mn +@@ -40,7 +40,6 @@ toolkit.jar: + content/global/plugins.css + content/global/plugins.js + content/global/browser-child.js +-* content/global/buildconfig.html + content/global/buildconfig.css + content/global/contentAreaUtils.js + content/global/datepicker.xhtml diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 7f1d9763e4246..b4e0d9c582672 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,23 +7,12 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "83.0"; + ffversion = "84.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "3va5a9471677jfzkhqp8xkba45n0bcpphbabhqbcbnps6p85m3y98pl5jy9q7cpq3a6gxc4ax7bp90yz2nfvfq7i64iz397xpprri2a"; + sha512 = "0sl93h7pjiznabv6865pdbal08nlqncnv3g40l02mgwbphjh5iqrr1bz14khaf58h4v1la090cj7z0gmd0c10xfrx6z7wngm152zz75"; }; - patches = [ - # Fix compilation on aarch64 with newer rust version - # See https://bugzilla.mozilla.org/show_bug.cgi?id=1677690 - # and https://bugzilla.redhat.com/show_bug.cgi?id=1897675 - (fetchpatch { - name = "aarch64-simd-bgz-1677690.patch"; - url = "https://github.com/mozilla/gecko-dev/commit/71597faac0fde4f608a60dd610d0cefac4972cc3.patch"; - sha256 = "1f61nsgbv2c2ylgjs7wdahxrrlgc19gjy5nzs870zr1g832ybwin"; - }) - ]; - meta = { description = "A web browser built from Firefox source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 5d299f3349ed0..56acb453a80cd 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, writeScript, desktop-file-utils -, pkgconfig, autoconf213, alsaLib, bzip2, cairo -, dbus, dbus-glib, ffmpeg_3, file, fontconfig, freetype +, pkg-config, autoconf213, alsaLib, bzip2, cairo +, dbus, dbus-glib, ffmpeg, file, fontconfig, freetype , gnome2, gnum4, gtk2, hunspell, libevent, libjpeg , libnotify, libstartup_notification, wrapGAppsHook , libGLU, libGL, perl, python2, libpulseaudio @@ -11,19 +11,19 @@ let - libPath = lib.makeLibraryPath [ ffmpeg_3 libpulseaudio ]; + libPath = lib.makeLibraryPath [ ffmpeg libpulseaudio ]; gtkVersion = if withGTK3 then "3" else "2"; in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.16.0"; + version = "28.17.0"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "1svwbiar7c38c8xfw249mwnvayqq5868nkks7cbv9nyf2m9yap56"; + sha256 = "0478xn5skpls91hkraykc308hppdc8vj9xbgvlm5wkv0y4dp7h5x"; fetchSubmodules = true; }; @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - desktop-file-utils file gnum4 perl pkgconfig python2 wget which wrapGAppsHook + desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook ]; buildInputs = [ - alsaLib bzip2 cairo dbus dbus-glib ffmpeg_3 fontconfig freetype + alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype gnome2.GConf gtk2 hunspell libevent libjpeg libnotify libstartup_notification libGLU libGL libpulseaudio unzip yasm zip zlib @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; configurePhase = '' - export MOZCONFIG=$(pwd)/mozconfig + export MOZCONFIG=$PWD/mozconfig export MOZ_NOSPAM=1 # Keep this similar to the official .mozconfig file, @@ -114,18 +114,18 @@ in stdenv.mkDerivation rec { ' ''; - buildPhase = "$src/mach build"; + buildPhase = "./mach build"; installPhase = '' - $src/mach install + ./mach install desktop-file-install --dir=$out/share/applications \ - $src/palemoon/branding/official/palemoon.desktop + ./palemoon/branding/official/palemoon.desktop for iconname in default{16,22,24,32,48,256} mozicon128; do n=''${iconname//[^0-9]/} size=$n"x"$n - install -Dm644 $src/palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png + install -Dm644 ./palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png done ''; 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 222b1b5b767cf..ab8a21c5b71b7 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -91,19 +91,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0.5"; + version = "10.0.7"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "1cxh39x69m4lgqin5k5p67gs9g26w7cnlbdpjqi8dw47y0bpr9xw"; + sha256 = "1phqsdf9lav0s111chlgyh4xiq2rm5zcxbx676i9711lkmc5l053"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "1cyg5ic7mrj6x1gxw5w609933d9ripa5b5gxyqnvnxfa23dkh608"; + sha256 = "1nkppwdcjbrx8nh3d6qvvkgd5by6ja5ckjgpbkhavyy2pqlxyqk8"; }; }; in diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix deleted file mode 100644 index c23a8cead3a77..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, mkChromiumDerivation, channel, enableWideVine }: - -with stdenv.lib; - -mkChromiumDerivation (base: rec { - name = "chromium-browser"; - packageName = "chromium"; - buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ]; - - outputs = ["out" "sandbox"]; - - sandboxExecutableName = "__chromium-suid-sandbox"; - - installPhase = '' - mkdir -p "$libExecPath" - cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" - cp -v "$buildPath/icudtl.dat" "$libExecPath/" - cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" - cp -v "$buildPath/chrome" "$libExecPath/$packageName" - - # Swiftshader - # See https://stackoverflow.com/a/4264351/263061 for the find invocation. - if [ -n "$(find "$buildPath/swiftshader/" -maxdepth 1 -name '*.so' -print -quit)" ]; then - echo "Swiftshader files found; installing" - mkdir -p "$libExecPath/swiftshader" - cp -v "$buildPath/swiftshader/"*.so "$libExecPath/swiftshader/" - else - echo "Swiftshader files not found" - fi - - mkdir -p "$sandbox/bin" - cp -v "$buildPath/chrome_sandbox" "$sandbox/bin/${sandboxExecutableName}" - - mkdir -vp "$out/share/man/man1" - cp -v "$buildPath/chrome.1" "$out/share/man/man1/$packageName.1" - - for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do - num_and_suffix="''${icon_file##*logo_}" - icon_size="''${num_and_suffix%.*}" - expr "$icon_size" : "^[0-9][0-9]*$" || continue - logo_output_prefix="$out/share/icons/hicolor" - logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" - mkdir -vp "$logo_output_path" - cp -v "$icon_file" "$logo_output_path/$packageName.png" - done - - # Install Desktop Entry - install -D chrome/installer/linux/common/desktop.template \ - $out/share/applications/chromium-browser.desktop - - substituteInPlace $out/share/applications/chromium-browser.desktop \ - --replace "@@MENUNAME@@" "Chromium" \ - --replace "@@PACKAGE@@" "chromium" \ - --replace "Exec=/usr/bin/@@USR_BIN_SYMLINK_NAME@@" "Exec=chromium" - - # Append more mime types to the end - sed -i '/^MimeType=/ s,$,x-scheme-handler/webcal;x-scheme-handler/mailto;x-scheme-handler/about;x-scheme-handler/unknown,' \ - $out/share/applications/chromium-browser.desktop - - # See https://github.com/NixOS/nixpkgs/issues/12433 - sed -i \ - -e '/\[Desktop Entry\]/a\' \ - -e 'StartupWMClass=chromium-browser' \ - $out/share/applications/chromium-browser.desktop - ''; - - passthru = { inherit sandboxExecutableName; }; - - requiredSystemFeatures = [ "big-parallel" ]; - - meta = { - description = "An open source web browser from Google, with dependencies on Google web services removed"; - longDescription = '' - Chromium is an open source web browser from Google that aims to build a - safer, faster, and more stable way for all Internet users to experience - the web. It has a minimalist user interface and provides the vast majority - of source code for Google Chrome (which has some additional features). - ''; - homepage = "https://github.com/Eloston/ungoogled-chromium"; - maintainers = with maintainers; [ squalus ]; - license = if enableWideVine then licenses.unfree else licenses.bsd3; - platforms = platforms.linux; - hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; - timeout = 172800; # 48 hours (increased from the Hydra default of 10h) - }; -}) diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix deleted file mode 100644 index 17814c26caa4d..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ /dev/null @@ -1,345 +0,0 @@ -{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, fetchurl - -# default dependencies -, gnutar, bzip2, flac, speex, libopus -, libevent, expat, libjpeg, snappy -, libpng, libcap -, xdg_utils, yasm, nasm, minizip, libwebp -, libusb1, pciutils, nss, re2 - -, python2Packages, perl, pkgconfig -, nspr, systemd, kerberos -, util-linux, alsaLib -, bison, gperf -, glib, gtk3, dbus-glib -, glibc -, libXScrnSaver, libXcursor, libXtst, libGLU, libGL -, protobuf, speechd, libXdamage, cups -, ffmpeg, libxslt, libxml2, at-spi2-core -, jre8 -, pipewire_0_2 -, libva - -# optional dependencies -, libgcrypt ? null # gnomeSupport || cupsSupport -, libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone - -# package customization -, useOzone ? true -, gnomeSupport ? false, gnome ? null -, gnomeKeyringSupport ? false, libgnome-keyring3 ? null -, proprietaryCodecs ? true -, cupsSupport ? true -, pulseSupport ? false, libpulseaudio ? null -, ungoogled-chromium -, ungoogled ? false - -, channel -, upstream-info -}: - -buildFun: - -with stdenv.lib; - -let - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - - # The additional attributes for creating derivations based on the chromium - # source tree. - extraAttrs = buildFun base; - - githubPatch = commit: sha256: fetchpatch { - url = "https://github.com/chromium/chromium/commit/${commit}.patch"; - inherit sha256; - }; - - mkGnFlags = - let - # Serialize Nix types into GN types according to this document: - # https://source.chromium.org/gn/gn/+/master:docs/language.md - mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\""; - sanitize = value: - if value == true then "true" - else if value == false then "false" - else if isList value then "[${concatMapStringsSep ", " sanitize value}]" - else if isInt value then toString value - else if isString value then mkGnString value - else throw "Unsupported type for GN value `${value}'."; - toFlag = key: value: "${key}=${sanitize value}"; - in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); - - # https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py - gnSystemLibraries = [ - "ffmpeg" - "flac" - "libjpeg" - "libpng" - "libwebp" - "libxslt" - "opus" - "snappy" - "zlib" - ]; - - opusWithCustomModes = libopus.override { - withCustomModes = true; - }; - - defaultDependencies = [ - bzip2 flac speex opusWithCustomModes - libevent expat libjpeg snappy - libpng libcap - xdg_utils minizip libwebp - libusb1 re2 - ffmpeg libxslt libxml2 - nasm - ]; - - # build paths and release info - packageName = extraAttrs.packageName or extraAttrs.name; - buildType = "Release"; - buildPath = "out/${buildType}"; - libExecPath = "$out/libexec/${packageName}"; - - versionRange = min-version: upto-version: - let inherit (upstream-info) version; - result = versionAtLeast version min-version && versionOlder version upto-version; - stable-version = (importJSON ./upstream-info.json).stable.version; - in if versionAtLeast stable-version upto-version - then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." - result - else result; - - ungoogler = - let versionEntry = (import ./ungoogled-src.nix)."${upstream-info.version}"; - in ungoogled-chromium { - inherit (versionEntry) rev sha256; - }; - base = rec { - name = "${packageName}-unwrapped-${version}"; - inherit (upstream-info) version; - inherit channel packageName buildType buildPath; - - src = fetchurl { - url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; - inherit (upstream-info) sha256; - }; - - nativeBuildInputs = [ - llvmPackages.lldClang.bintools - ninja which python2Packages.python perl pkgconfig - python2Packages.ply python2Packages.jinja2 nodejs - gnutar python2Packages.setuptools - ]; - - buildInputs = defaultDependencies ++ [ - nspr nss systemd - util-linux alsaLib - bison gperf kerberos - glib gtk3 dbus-glib - libXScrnSaver libXcursor libXtst libGLU libGL - pciutils protobuf speechd libXdamage at-spi2-core - jre - pipewire_0_2 - libva - ] ++ optional gnomeKeyringSupport libgnome-keyring3 - ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] - ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio - ++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ]; - - patches = [ - ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) - ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags - # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) - ]; - - postPatch = '' - # remove unused third-party - for lib in ${toString gnSystemLibraries}; do - if [ -d "third_party/$lib" ]; then - find "third_party/$lib" -type f \ - \! -path "third_party/$lib/chromium/*" \ - \! -path "third_party/$lib/google/*" \ - \! -path "third_party/harfbuzz-ng/utils/hb_scoped.h" \ - \! -regex '.*\.\(gn\|gni\|isolate\)' \ - -delete - fi - done - - # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.): - substituteInPlace native_client/SConstruct --replace "#! -*- python -*-" "" - if [ -e third_party/harfbuzz-ng/src/src/update-unicode-tables.make ]; then - substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ - --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" - fi - - # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX - substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ - --replace \ - 'return sandbox_binary;' \ - 'return base::FilePath(GetDevelSandboxPath());' - - substituteInPlace services/audio/audio_sandbox_hook_linux.cc \ - --replace \ - '/usr/share/alsa/' \ - '${alsaLib}/share/alsa/' \ - --replace \ - '/usr/lib/x86_64-linux-gnu/gconv/' \ - '${glibc}/lib/gconv/' \ - --replace \ - '/usr/share/locale/' \ - '${glibc}/share/locale/' - - sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ - chrome/browser/shell_integration_linux.cc - - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ - device/udev_linux/udev?_loader.cc - - sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ - gpu/config/gpu_info_collector_linux.cc - - # Allow to put extensions into the system-path. - sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc - - patchShebangs . - # use our own nodejs - mkdir -p third_party/node/linux/node-linux-x64/bin - ln -s "$(command -v node)" third_party/node/linux/node-linux-x64/bin/node - - # Allow building against system libraries in official builds - sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py - - '' + optionalString stdenv.isAarch64 '' - substituteInPlace build/toolchain/linux/BUILD.gn \ - --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' - '' + optionalString ungoogled '' - ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors" - ${ungoogler}/utils/patches.py . ${ungoogler}/patches - ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz . - ''; - - gnFlags = mkGnFlags ({ - custom_toolchain = "//build/toolchain/linux/unbundle:default"; - host_toolchain = "//build/toolchain/linux/unbundle:default"; - is_official_build = true; - - use_vaapi = !stdenv.isAarch64; # TODO: Remove once M88 is released - use_sysroot = false; - use_gnome_keyring = gnomeKeyringSupport; - use_gio = gnomeSupport; - # ninja: error: '../../native_client/toolchain/linux_x86/pnacl_newlib/bin/x86_64-nacl-objcopy', - # needed by 'nacl_irt_x86_64.nexe', missing and no known rule to make it - enable_nacl = false; - # Enabling the Widevine component here doesn't affect whether we can - # redistribute the chromium package; the Widevine component is either - # added later in the wrapped -wv build or downloaded from Google. - enable_widevine = true; - use_cups = cupsSupport; - # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture. - rtc_use_pipewire = true; - - treat_warnings_as_errors = false; - clang_use_chrome_plugins = false; - blink_symbol_level = 0; - symbol_level = 0; - fieldtrial_testing_like_official_build = true; - - # Google API keys, see: - # http://www.chromium.org/developers/how-tos/api-keys - # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, - # please get your own set of keys. - google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; - google_default_client_id = "404761575300.apps.googleusercontent.com"; - google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D"; - } // optionalAttrs proprietaryCodecs { - # enable support for the H.264 codec - proprietary_codecs = true; - enable_hangout_services_extension = true; - ffmpeg_branding = "Chrome"; - } // optionalAttrs pulseSupport { - use_pulseaudio = true; - link_pulseaudio = true; - } // optionalAttrs useOzone { - use_ozone = true; - use_xkbcommon = true; - use_glib = true; - use_gtk = true; - use_system_libwayland = true; - use_system_minigbm = true; - use_system_libdrm = true; - system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; - } // optionalAttrs ungoogled { - chrome_pgo_phase = 0; - enable_hangout_services_extension = false; - enable_js_type_check = false; - enable_mdns = false; - enable_nacl_nonsfi = false; - enable_one_click_signin = false; - enable_reading_list = false; - enable_remoting = false; - enable_reporting = false; - enable_service_discovery = false; - exclude_unwind_tables = true; - google_api_key = ""; - google_default_client_id = ""; - google_default_client_secret = ""; - safe_browsing_mode = 0; - use_official_google_api_keys = false; - use_unofficial_version_number = false; - } // (extraAttrs.gnFlags or {})); - - configurePhase = '' - runHook preConfigure - - # This is to ensure expansion of $out. - libExecPath="${libExecPath}" - python build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} - ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt - - # Fail if `gn gen` contains a WARNING. - grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1 - - runHook postConfigure - ''; - - # Don't spam warnings about unknown warning options. This is useful because - # our Clang is always older than Chromium's and the build logs have a size - # of approx. 25 MB without this option (and this saves e.g. 66 %). - NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option"; - - buildPhase = let - buildCommand = target: '' - ninja -C "${buildPath}" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES "${target}" - ( - source chrome/installer/linux/common/installer.include - PACKAGE=$packageName - MENUNAME="Chromium" - process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1" - ) - ''; - targets = extraAttrs.buildTargets or []; - commands = map buildCommand targets; - in concatStringsSep "\n" commands; - - postFixup = '' - # Make sure that libGLESv2 is found by dlopen (if using EGL). - chromiumBinary="$libExecPath/$packageName" - origRpath="$(patchelf --print-rpath "$chromiumBinary")" - patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary" - ''; - - passthru = { - updateScript = ./update.py; - chromiumDeps = { - gn = gnChromium; - }; - }; - }; - -# Remove some extraAttrs we supplied to the base attributes already. -in stdenv.mkDerivation (base // removeAttrs extraAttrs [ - "name" "gnFlags" "buildTargets" -] // { passthru = base.passthru // (extraAttrs.passthru or {}); }) diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix deleted file mode 100644 index b75d271ace55d..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix +++ /dev/null @@ -1,214 +0,0 @@ -{ newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils -, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit -, libva ? null -, pipewire_0_2 -, gcc, nspr, nss, runCommand -, lib - -# package customization -# Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) -, channel ? "stable" -, gnomeSupport ? false, gnome ? null -, gnomeKeyringSupport ? false -, proprietaryCodecs ? true -, enablePepperFlash ? false -, enableWideVine ? false -, enableVaapi ? false # Disabled by default due to unofficial support -, ungoogled ? true -, cupsSupport ? true -, pulseSupport ? config.pulseaudio or stdenv.isLinux -, commandLineArgs ? "" -}: - -let - llvmPackages = llvmPackages_11; - stdenv = llvmPackages.stdenv; - - callPackage = newScope chromium; - - chromium = rec { - inherit stdenv llvmPackages; - - upstream-info = (lib.importJSON ./upstream-info.json).${channel}; - - mkChromiumDerivation = callPackage ./common.nix ({ - inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs - cupsSupport pulseSupport; - inherit ungoogled; - gnChromium = gn.overrideAttrs (oldAttrs: { - inherit (upstream-info.deps.gn) version; - src = fetchgit { - inherit (upstream-info.deps.gn) url rev sha256; - }; - }); - }); - - browser = callPackage ./browser.nix { inherit channel enableWideVine; }; - - plugins = callPackage ./plugins.nix { - inherit enablePepperFlash; - }; - - ungoogled-chromium = callPackage ./ungoogled.nix {}; - }; - - pkgSuffix = if channel == "dev" then "unstable" else channel; - pkgName = "google-chrome-${pkgSuffix}"; - chromeSrc = fetchurl { - urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ - "https://dl.google.com/linux/chrome/deb/pool/main/g" - "http://95.31.35.30/chrome/pool/main/g" - "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" - "http://repo.fdzh.org/chrome/deb/pool/main/g" - ]; - sha256 = chromium.upstream-info.sha256bin64; - }; - - mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; - widevineCdm = stdenv.mkDerivation { - name = "chrome-widevine-cdm"; - - src = chromeSrc; - - phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; - - unpackCmd = let - widevineCdmPath = - if channel == "stable" then - "./opt/google/chrome/WidevineCdm" - else if channel == "beta" then - "./opt/google/chrome-beta/WidevineCdm" - else if channel == "dev" then - "./opt/google/chrome-unstable/WidevineCdm" - else - throw "Unknown chromium channel."; - in '' - # Extract just WidevineCdm from upstream's .deb file - ar p "$src" data.tar.xz | tar xJ "${widevineCdmPath}" - - # Move things around so that we don't have to reference a particular - # chrome-* directory later. - mv "${widevineCdmPath}" ./ - - # unpackCmd wants a single output directory; let it take WidevineCdm/ - rm -rf opt - ''; - - doCheck = true; - checkPhase = '' - ! find -iname '*.so' -exec ldd {} + | grep 'not found' - ''; - - PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ]; - - patchPhase = '' - patchelf --set-rpath "$PATCH_RPATH" _platform_specific/linux_x64/libwidevinecdm.so - ''; - - installPhase = '' - mkdir -p $out/WidevineCdm - cp -a * $out/WidevineCdm/ - ''; - - meta = { - platforms = [ "x86_64-linux" ]; - license = lib.licenses.unfree; - }; - }; - - suffix = if channel != "stable" then "-" + channel else ""; - - sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName; - - version = chromium.browser.version; - - # We want users to be able to enableWideVine without rebuilding all of - # chromium, so we have a separate derivation here that copies chromium - # and adds the unfree WidevineCdm. - chromiumWV = let browser = chromium.browser; in if enableWideVine then - runCommand (browser.name + "-wv") { version = browser.version; } - '' - mkdir -p $out - cp -a ${browser}/* $out/ - chmod u+w $out/libexec/chromium - cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/ - '' - else browser; - -in stdenv.mkDerivation { - name = "ungoogled-chromium${suffix}-${version}"; - inherit version; - - buildInputs = [ - makeWrapper ed - - # needed for GSETTINGS_SCHEMAS_PATH - gsettings-desktop-schemas glib gtk3 - - # needed for XDG_ICON_DIRS - gnome3.adwaita-icon-theme - ]; - - outputs = ["out" "sandbox"]; - - buildCommand = let - browserBinary = "${chromiumWV}/libexec/chromium/chromium"; - getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; - libPath = stdenv.lib.makeLibraryPath [ libva pipewire_0_2 ]; - - in with stdenv.lib; '' - mkdir -p "$out/bin" - - eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ - --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ - ${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"} \ - ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} - - ed -v -s "$out/bin/chromium" << EOF - 2i - - if [ -x "/run/wrappers/bin/${sandboxExecutableName}" ] - then - export CHROME_DEVEL_SANDBOX="/run/wrappers/bin/${sandboxExecutableName}" - else - export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}" - fi - - '' + lib.optionalString (libPath != "") '' - # To avoid loading .so files from cwd, LD_LIBRARY_PATH here must not - # contain an empty section before or after a colon. - export LD_LIBRARY_PATH="\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${libPath}" - '' + '' - - # libredirect causes chromium to deadlock on startup - export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | ${coreutils}/bin/tr ':' '\n' | ${gnugrep}/bin/grep -v /lib/libredirect\\\\.so$ | ${coreutils}/bin/tr '\n' ':')" - - export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS - - # Mainly for xdg-open but also other xdg-* tools: - export PATH="${xdg_utils}/bin\''${PATH:+:}\$PATH" - - . - w - EOF - - ln -sv "${chromium.browser.sandbox}" "$sandbox" - - ln -s "$out/bin/chromium" "$out/bin/chromium-browser" - - mkdir -p "$out/share" - for f in '${chromium.browser}'/share/*; do # hello emacs */ - ln -s -t "$out/share/" "$f" - done - ''; - - inherit (chromium.browser) packageName; - meta = chromium.browser.meta; - passthru = { - inherit (chromium) upstream-info browser; - mkDerivation = chromium.mkChromiumDerivation; - inherit chromeSrc sandboxExecutableName; - updateScript = ./update.py; - }; -} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch deleted file mode 100644 index 6b788f43d29c0..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- chromium-70.0.3538.67/build/compute_build_timestamp.py.orig 2018-11-02 16:00:34.368933077 +0200 -+++ chromium-70.0.3538.67/build/compute_build_timestamp.py 2018-11-08 04:06:21.658105129 +0200 -@@ -94,6 +94,14 @@ - 'build_type', help='The type of build', choices=('official', 'default')) - args = argument_parser.parse_args() - -+ # I don't trust LASTCHANGE magic, and I definelly want something deterministic here -+ SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None) -+ if SOURCE_DATE_EPOCH is not None: -+ print(SOURCE_DATE_EPOCH) -+ return 0 -+ else: -+ raise RuntimeError("SOURCE_DATE_EPOCH not set") -+ - # The mtime of the revision in build/util/LASTCHANGE is stored in a file - # next to it. Read it, to get a deterministic time close to "now". - # That date is then modified as described at the top of the file so that diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch deleted file mode 100644 index 32f0ae2fb5e66..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn -index ed0e2f5208b..5b431a030d5 100644 ---- a/third_party/widevine/cdm/BUILD.gn -+++ b/third_party/widevine/cdm/BUILD.gn -@@ -14,7 +14,7 @@ buildflag_header("buildflags") { - - flags = [ - "ENABLE_WIDEVINE=$enable_widevine", -- "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm", -+ "BUNDLE_WIDEVINE_CDM=true", - "ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component", - ] - } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix deleted file mode 100644 index eef1c5ef38c28..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ stdenv, gcc -, jshon -, glib -, nspr -, nss -, fetchzip -, enablePepperFlash ? false - -, upstream-info -}: - -with stdenv.lib; - -let - mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}"; - - # Generate a shell fragment that emits flags appended to the - # final makeWrapper call for wrapping the browser's main binary. - # - # Note that this is shell-escaped so that only the variable specified - # by the "output" attribute is substituted. - mkPluginInfo = { output ? "out", allowedVars ? [ output ] - , flags ? [], envVars ? {} - }: let - shSearch = ["'"] ++ map (var: "@${var}@") allowedVars; - shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars; - # We need to triple-escape "val": - # * First because makeWrapper doesn't do any quoting of its arguments by - # itself. - # * Second because it's passed to the makeWrapper call separated by IFS but - # not by the _real_ arguments, for example the Widevine plugin flags - # contain spaces, so they would end up as separate arguments. - # * Third in order to be correctly quoted for the "echo" call below. - shEsc = val: "'${replaceStrings ["'"] ["'\\''"] val}'"; - mkSh = val: "'${replaceStrings shSearch shReplace (shEsc val)}'"; - mkFlag = flag: ["--add-flags" (shEsc flag)]; - mkEnvVar = key: val: ["--set" (shEsc key) (shEsc val)]; - envList = mapAttrsToList mkEnvVar envVars; - quoted = map mkSh (flatten ((map mkFlag flags) ++ envList)); - in '' - mkdir -p "''$${output}/nix-support" - echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags" - ''; - - flash = stdenv.mkDerivation rec { - pname = "flashplayer-ppapi"; - version = "32.0.0.465"; - - src = fetchzip { - url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "16qbc2s8dg2rwggphf8f5665iccc6lrvgz45bdwskg9pwg87hlj1"; - stripRoot = false; - }; - - patchPhase = '' - chmod +x libpepflashplayer.so - patchelf --set-rpath "${mkrpath [ gcc.cc ]}" libpepflashplayer.so - ''; - - doCheck = true; - checkPhase = '' - ! find -iname '*.so' -exec ldd {} + | grep 'not found' - ''; - - installPhase = '' - flashVersion="$( - "${jshon}/bin/jshon" -F manifest.json -e version -u - )" - - install -vD libpepflashplayer.so "$out/lib/libpepflashplayer.so" - - ${mkPluginInfo { - allowedVars = [ "out" "flashVersion" ]; - flags = [ - "--ppapi-flash-path=@out@/lib/libpepflashplayer.so" - "--ppapi-flash-version=@flashVersion@" - ]; - }} - ''; - - dontStrip = true; - - meta = { - license = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ taku0 ]; - platforms = platforms.x86_64; - }; - }; - -in { - enabled = optional enablePepperFlash flash; -} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix deleted file mode 100644 index 26f2f730a41d6..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - "87.0.4280.88" = { - rev = "87.0.4280.88-1"; - sha256 = "0w2137w8hfcgl6f938hqnb4ffp33v5r8vdzxrvs814w7dszkiqgg"; - }; -} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/update.py b/pkgs/applications/networking/browsers/ungoogled-chromium/update.py deleted file mode 100755 index 9e1f0aec598da..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/update.py +++ /dev/null @@ -1,121 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i python -p python3 nix nix-prefetch-git - -import csv -import json -import re -import subprocess -import sys - -from codecs import iterdecode -from collections import OrderedDict -from datetime import datetime -from os.path import abspath, dirname -from urllib.request import urlopen - -HISTORY_URL = 'https://omahaproxy.appspot.com/history?os=linux' -DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g' -BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official' - -JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json' - -def load_json(path): - with open(path, 'r') as f: - return json.load(f) - -def nix_prefetch_url(url, algo='sha256'): - print(f'nix-prefetch-url {url}') - out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url]) - return out.decode('utf-8').rstrip() - -def nix_prefetch_git(url, rev): - print(f'nix-prefetch-git {url} {rev}') - out = subprocess.check_output(['nix-prefetch-git', '--quiet', '--url', url, '--rev', rev]) - return json.loads(out) - -def get_file_revision(revision, file_path): - url = f'https://raw.githubusercontent.com/chromium/chromium/{revision}/{file_path}' - with urlopen(url) as http_response: - return http_response.read() - -def get_matching_chromedriver(version): - # See https://chromedriver.chromium.org/downloads/version-selection - build = re.sub('.[0-9]+$', '', version) - chromedriver_version_url = f'https://chromedriver.storage.googleapis.com/LATEST_RELEASE_{build}' - with urlopen(chromedriver_version_url) as http_response: - chromedriver_version = http_response.read().decode() - def get_chromedriver_url(system): - return f'https://chromedriver.storage.googleapis.com/{chromedriver_version}/chromedriver_{system}.zip' - return { - 'version': chromedriver_version, - 'sha256_linux': nix_prefetch_url(get_chromedriver_url('linux64')), - 'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac64')) - } - -def get_channel_dependencies(channel): - deps = get_file_revision(channel['version'], 'DEPS') - gn_pattern = b"'gn_version': 'git_revision:([0-9a-f]{40})'" - gn_commit = re.search(gn_pattern, deps).group(1).decode() - gn = nix_prefetch_git('https://gn.googlesource.com/gn', gn_commit) - return { - 'gn': { - 'version': datetime.fromisoformat(gn['date']).date().isoformat(), - 'url': gn['url'], - 'rev': gn['rev'], - 'sha256': gn['sha256'] - } - } - -channels = {} -last_channels = load_json(JSON_PATH) - -print(f'GET {HISTORY_URL}', file=sys.stderr) -with urlopen(HISTORY_URL) as resp: - builds = csv.DictReader(iterdecode(resp, 'utf-8')) - for build in builds: - channel_name = build['channel'] - - # If we've already found a newer build for this channel, we're - # no longer interested in it. - if channel_name in channels: - continue - - # If we're back at the last build we used, we don't need to - # keep going -- there's no new version available, and we can - # just reuse the info from last time. - if build['version'] == last_channels[channel_name]['version']: - channels[channel_name] = last_channels[channel_name] - continue - - channel = {'version': build['version']} - suffix = 'unstable' if channel_name == 'dev' else channel_name - - try: - channel['sha256'] = nix_prefetch_url(f'{BUCKET_URL}/chromium-{build["version"]}.tar.xz') - channel['sha256bin64'] = nix_prefetch_url(f'{DEB_URL}/google-chrome-{suffix}/google-chrome-{suffix}_{build["version"]}-1_amd64.deb') - except subprocess.CalledProcessError: - # This build isn't actually available yet. Continue to - # the next one. - continue - - channel['deps'] = get_channel_dependencies(channel) - if channel_name == 'stable': - channel['chromedriver'] = get_matching_chromedriver(channel['version']) - - channels[channel_name] = channel - -with open(JSON_PATH, 'w') as out: - def get_channel_key(item): - channel_name = item[0] - if channel_name == 'stable': - return 0 - elif channel_name == 'beta': - return 1 - elif channel_name == 'dev': - return 2 - else: - print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr) - sys.exit(1) - sorted_channels = OrderedDict(sorted(channels.items(), key=get_channel_key)) - json.dump(sorted_channels, out, indent=2) - out.write('\n') diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json deleted file mode 100644 index 6343dd4b2468c..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "stable": { - "version": "87.0.4280.88", - "sha256": "1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy", - "sha256bin64": "0n3fm6wf8zfkv135d50xl8xxrnng3q55vyxkck1da8jyvh18bijb", - "deps": { - "gn": { - "version": "2020-09-09", - "url": "https://gn.googlesource.com/gn", - "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", - "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" - } - }, - "chromedriver": { - "version": "87.0.4280.88", - "sha256_linux": "141mr2jiy3nslwd3s43m4i6plkv9wv5fgi78cn7mz0ac9x6fpcgx", - "sha256_darwin": "048hsqp6575r980m769lzznvxypmfcwn89f1d3ik751ymzmb5r78" - } - }, - "beta": { - "version": "88.0.4324.27", - "sha256": "0mciiyh3sn2zrl8g6znylc2pm9sb0wzsclgavf7mmlknri5sjblc", - "sha256bin64": "0qf2j1j3p94s724rwh8fydpjn88cs9yxxhjf5axvqwi7q3h35cfx", - "deps": { - "gn": { - "version": "2020-11-05", - "url": "https://gn.googlesource.com/gn", - "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", - "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" - } - } - }, - "dev": { - "version": "89.0.4343.0", - "sha256": "0jmc1l0lysl5zax98fjhzsfq3c1sqh3n3xscidafflx362wcfpwa", - "sha256bin64": "1v6xik8kf531y0g5xj0c8szjmak0qvh77kwkw7p7hqxqmnwwp06d", - "deps": { - "gn": { - "version": "2020-11-05", - "url": "https://gn.googlesource.com/gn", - "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", - "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" - } - } - } -} diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index aa4dd7f8e4439..cf37a31ee4235 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE +{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr , alsaLib, dbus, cups, libexif, ffmpeg_3, systemd , freetype, fontconfig, libXft, libXrender, libxcb, expat @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "3.4.2066.90-1"; + version = "3.5.2115.73-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "059vcr2j0vr8szqcxfqnzxwy5i8z53g71fwhm22nc0477jbrsxz1"; + sha256 = "0gjar22b0qdirww4mlb0d0pm2cqkhlp1jn88gwxwvx6g72p3b6lz"; }; unpackPhase = '' @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ - stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb + stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg_3 systemd freetype fontconfig libXrender libuuid expat glib nss nspr diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 629f11865bbc7..c35579def7e9a 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -223,7 +223,7 @@ let }; in stdenv.mkDerivation rec { - name = "k3s"; + pname = "k3s"; version = k3sVersion; # Important utilities used by the kubelet, see diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 4afb7458ff3e4..ed00fb231a650 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "nerdctl"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "AkihiroSuda"; repo = pname; rev = "v${version}"; - sha256 = "1bxxdsx8aqbrbjm0bn6makw77z96mng5by7k3licbk0vdgakaix6"; + sha256 = "0vjcbvd5yrasw97hd5mrn6cdjvfv2r03z7g1wczlszlcs8gr6nxw"; }; - vendorSha256 = "1d2bqv7bc7q82z6sd8kkqj4xdccs660mj34ggwb09a59law139li"; + vendorSha256 = "181lp9l4i0qpiqm8wbxa4ldi1j5bm3ygmanz1xh3mkjanl0pwqjr"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/nomad/0.11.nix b/pkgs/applications/networking/cluster/nomad/0.11.nix index 6487a2edd7f60..2fd7c0403a3c4 100644 --- a/pkgs/applications/networking/cluster/nomad/0.11.nix +++ b/pkgs/applications/networking/cluster/nomad/0.11.nix @@ -2,6 +2,6 @@ callPackage ./generic.nix { inherit buildGoPackage; - version = "0.11.7"; - sha256 = "sha256-wp1Je+I3iijD/pHHQtylMQhOiVhS6AT/y2/pUiLr0M4="; + version = "0.11.8"; + sha256 = "1dhh07bifr02jh2lls8fv1d9ra67ymgh8qxqvpvm0cd0qdd469z1"; } diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix index 863f7cbed2f9b..0120887957a85 100644 --- a/pkgs/applications/networking/cluster/nomad/0.12.nix +++ b/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -2,6 +2,6 @@ callPackage ./generic.nix { inherit buildGoPackage; - version = "0.12.7"; - sha256 = "0y1nwmpc4fqgjyb19n1f2w4y5k7fy4p68v2vnnry11nj3im7ia14"; + version = "0.12.9"; + sha256 = "1a0ig6pb0z3qp7zk4jgz3h241bifmjlyqsfikyy3sxdnzj7yha27"; } diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix new file mode 100644 index 0000000000000..4b0b62400193e --- /dev/null +++ b/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -0,0 +1,7 @@ +{ callPackage, buildGoPackage }: + +callPackage ./generic.nix { + inherit buildGoPackage; + version = "1.0.1"; + sha256 = "07k81csyxhgc7bgn297zlqyvc55qb5fmiavi7dk81rdpg5m2zjvv"; +} diff --git a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix index 293c2ed31c03a..f7bcbca16c486 100644 --- a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard-octant-plugin"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "140m7mnpqhfbp2qqpr3jjsc770xdph98mm5zpgwzg0jwgpsrcxsm"; + sha256 = "11c8znbijhvxl2mas205mb18sqw868l6c86ah5hlkqh3niq2gmv3"; }; - vendorSha256 = "0aphx2rpnvzmfyfs11hf8j5b7s5lgw4kcq4jpdrkjwx7zhl6qx2g"; + vendorSha256 = "0rmynfm5afjxc2lxy2rh9y6zhdd2q95wji2q8hcz78zank43rkcq"; meta = with lib; { description = "Octant plugin for viewing Starboard security information"; diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index be5cb51d450de..668a229a62e5b 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -7,10 +7,8 @@ buildGoModule rec { pname = "sonobuoy"; version = "0.19.0"; - goPackagePath = "github.com/vmware-tanzu/sonobuoy"; - buildFlagsArray = - let t = goPackagePath; + let t = "github.com/vmware-tanzu/sonobuoy"; in '' -ldflags= -s -X ${t}/pkg/buildinfo.Version=v${version} diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 0f8ed05d8e6af..29aa7d41f32a0 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -1,27 +1,28 @@ -{ stdenv, lib, buildPackages, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ stdenv, lib, buildPackages, buildGoModule, fetchFromGitHub, installShellFiles }: +let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; -let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in - -buildGoPackage rec { +in +buildGoModule rec { pname = "stern"; - version = "1.11.0"; - - goPackagePath = "github.com/wercker/stern"; + version = "1.13.1"; src = fetchFromGitHub { - owner = "wercker"; + owner = "stern"; repo = "stern"; - rev = version; - sha256 = "0xndlq0ks8flzx6rdd4lnkxpkbvdy9sj1jwys5yj7p989ls8by3n"; + rev = "v${version}"; + sha256 = "0fj6a52wb0jv5bz2j2wq3ljnlxnsj9bg3kbzgkz0vh0b63zyn782"; }; - deleteVendor = true; - goDeps = ./deps.nix; + vendorSha256 = "14nrdaaby74bjbk777hr82p0ybzk3spc59lbrjn9z0q3hc0p4vaf"; nativeBuildInputs = [ installShellFiles ]; + buildFlagsArray = + [ "-ldflags=-s -w -X github.com/stern/stern/cmd.version=${version}" ]; + postInstall = - let stern = if isCrossBuild then buildPackages.stern else "$out"; in + let stern = if isCrossBuild then buildPackages.stern else "$out"; + in '' for shell in bash zsh; do ${stern}/bin/stern --completion $shell > stern.$shell @@ -30,10 +31,10 @@ buildGoPackage rec { ''; meta = with lib; { - description = "Multi pod and container log tailing for Kubernetes"; - homepage = "https://github.com/wercker/stern"; - license = licenses.asl20; - maintainers = with maintainers; [ mbode ]; - platforms = platforms.unix; + description = "Multi pod and container log tailing for Kubernetes"; + homepage = "https://github.com/stern/stern"; + license = licenses.asl20; + maintainers = with maintainers; [ mbode preisschild ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/stern/deps.nix b/pkgs/applications/networking/cluster/stern/deps.nix deleted file mode 100644 index fff5cf8c0de4a..0000000000000 --- a/pkgs/applications/networking/cluster/stern/deps.nix +++ /dev/null @@ -1,336 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "dfffe386c33fb24c34ee501e5723df5b97b98514"; - sha256 = "1g681yxz4mmzapzpzxfaz1nhcr1w526793yapfsnxlbs2skap3fy"; - }; - } - { - goPackagePath = "github.com/Azure/go-autorest"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-autorest"; - rev = "1ff28809256a84bb6966640ff3d0371af82ccba4"; - sha256 = "0sxvj2j1833bqwxvhq3wq3jgq73rnb81pnzvl0x3y1m0hzpaf2zv"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "2d684516a8861da43017284349b7e303e809ac21"; - sha256 = "1fcfmz4wji3gqmmsdx493r7d101s58hwjalqps6hy25nva5pvmfs"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "73d445a93680fa1a78ae23a5839bad48f32ba1ee"; - sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "c0656edd0d9eab7c66d1eb0c568f9039345796f7"; - sha256 = "0b943dhx571lhgcs3rqzy0092mi2x5mwy2kl7g8rryhy3r5rzrz9"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306"; - sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; - sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; - }; - } - { - goPackagePath = "github.com/googleapis/gnostic"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gnostic"; - rev = "0c5108395e2debce0d731cf0287ddf7242066aba"; - sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc"; - }; - } - { - goPackagePath = "github.com/gregjones/httpcache"; - fetch = { - type = "git"; - url = "https://github.com/gregjones/httpcache"; - rev = "787624de3eb7bd915c329cba748687a3b22666a6"; - sha256 = "1zqlg9pkj7r6fqw7wv3ywvbz3bh0hvzifs2scgcraj812q5189w5"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "6633656539c1639d9d78127b7d47c622b5d7b6dc"; - sha256 = "1fffbq1l17i0gynmvcxypl7d9h4v81g5vlimiph5bfgf4sp4db7g"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "f2b4162afba35581b6d4a50d3b8f34e33c144682"; - sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd"; - }; - } - { - 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 = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; - sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"; - sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49"; - }; - } - { - goPackagePath = "github.com/petar/GoLLRB"; - fetch = { - type = "git"; - url = "https://github.com/petar/GoLLRB"; - rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"; - sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; - }; - } - { - goPackagePath = "github.com/peterbourgon/diskv"; - fetch = { - type = "git"; - url = "https://github.com/peterbourgon/diskv"; - rev = "5f041e8faa004a95c88a202771f4cc3e991971e6"; - sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "816c9085562cd7ee03e7f8188a1cfd942858cded"; - sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "a114f312e075f65bf30d6d9a1430113f857e543b"; - sha256 = "10lmi5ni06yijxg02fcic5b7ycjkia12yma4a4lz8a56j30wykx1"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "3ebe029320b2676d667ae88da602a5f854788a8a"; - sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "49796115aa4b964c318aad4f3084fdb41e9aa067"; - sha256 = "0pcq2drkzsw585xi6rda8imd7a139prrmvgmv8nz0zgzk6g4dy59"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "1c05540f6879653db88113bc4a2b70aec4bd491f"; - sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "a6bd8cefa1811bd24b86f8902872e4e8225f74c4"; - sha256 = "151in8qcf5y97ziavl6b03vgw4r87zqx5kg4vjhjszjbh60cfswp"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "8e24a49d80f82323e1c4db1b5da3e0f31171a151"; - sha256 = "0zsdnyb8dy98jw6f9yn6g5gdhaqwk39hqridr0mh4dhwvwvlj724"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "f51c12702a4d776e4c1fa9b0fabab841babae631"; - sha256 = "07wc6g2fvafkr6djsscm0jpbpl4135khhb6kpyx1953hi5d1jvyy"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "ae0ab99deb4dc413a2b4bd6c8bdd0eb67f1e4d06"; - sha256 = "1iabxnqgxvvn1239i6fvfl375vlbvhfrc03m1x2rvalmx4d6w9c7"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://github.com/go-inf/inf"; - rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; - sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } - { - goPackagePath = "k8s.io/api"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/api"; - rev = "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6"; - sha256 = "1dpmd59jlkxgrp5aaf8420344c6nq4kjlc1avgcp7690yrzc50v6"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "594fc14b6f143d963ea2c8132e09e73fe244b6c9"; - sha256 = "0xykhpmjgagyb0ac4y0ps4v1s9bd2b1sc0simh48c41a9fk3yvr7"; - }; - } - { - goPackagePath = "k8s.io/client-go"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/client-go"; - rev = "739dd8f9d4801eb23e2bc43423c0b4acaaded29a"; - sha256 = "15psjmb14rz4kwysim9vfbbylx0khkw29b195rziv1vk202lh28k"; - }; - } -] \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index d18ec94ba8c56..6052f6882bc48 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -157,9 +157,9 @@ in rec { }); terraform_0_14 = pluggable (generic { - version = "0.14.2"; - sha256 = "0j09bjdl1z836y3zdlgjcdah11wlnvsd5hmsagjsz9am04qlyfya"; - vendorSha256 = "1iifjrnc79f4liyy4pgjbnarv2fx6vwlaqcv75crmyji40xv0w9s"; + version = "0.14.3"; + sha256 = "0w2j1phjv989bspbyvkhr25bdz1zjch3zggwk2lgjyk77mdw5h20"; + vendorSha256 = "03dg703pw3h98vfvi2mnd2lw0mv6hlhvmc1l7ngrqdyv54cmihnp"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 40ba3530c8aff..42de638ec42cf 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.17.13"; + version = "0.18.1"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x3U5OF8T3z9kHcYe7SwKVEKNiEsi8AEvA1rlOma4y+8="; + sha256 = "1sdb2x06va0j9cxdwz95dklv2csq0s596wjsjqi4sq65y9bxjr7i"; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix new file mode 100644 index 0000000000000..9623d5af2f4b9 --- /dev/null +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -0,0 +1,46 @@ +{ lib, buildGoModule, fetchFromGitHub, go-bindata }: + +buildGoModule rec { + pname = "waypoint"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = pname; + rev = "v${version}"; + sha256 = "115cak87kpfjckqgn8ws09z1w8x8l9bch9xrm29k4r0zi71xparn"; + }; + + deleteVendor = true; + vendorSha256 = "1xdari6841jp6lpjwydv19v3wafj17hmnwsa2b55iw6dysm4yxdr"; + + subPackages = ["."]; + + nativeBuildInputs = [ go-bindata ]; + + buildPhase = '' + CGO_ENABLED=0 go build -ldflags '-s -w -extldflags "-static"' -o ./internal/assets/ceb/ceb ./cmd/waypoint-entrypoint + cd internal/assets + go-bindata -pkg assets -o prod.go -tags assetsembedded ./ceb + cd ../../ + CGO_ENABLED=0 go build -ldflags '-s -w -X github.com/hashicorp/waypoint/version.GitDescribe=v${version}' -tags assetsembedded -o ./waypoint ./cmd/waypoint + CGO_ENABLED=0 go build -ldflags '-s -w' -tags assetsembedded -o ./waypoint-entrypoint ./cmd/waypoint-entrypoint + ''; + + installPhase = '' + mkdir -p $out/bin + mv waypoint{,-entrypoint} $out/bin/ + ''; + + meta = with lib; { + description = "A tool to build, deploy, and release any application on any platform"; + longDescription = '' + Waypoint allows developers to define their application build, deploy, and release lifecycle as code, reducing the + time to deliver deployments through a consistent and repeatable workflow. + ''; + homepage = "https://waypointproject.io"; + platforms = platforms.linux; + license = licenses.mpl20; + maintainers = with maintainers; [ winpat jk ]; + }; +} diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix index b8279f22de4d0..2992f28c58a0b 100644 --- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix @@ -1,19 +1,23 @@ { stdenv, fetchFromGitHub, python3Packages, }: python3Packages.buildPythonApplication rec { - version = "0.9.7"; + version = "0.9.8"; pname = "canto-daemon"; src = fetchFromGitHub { owner = "themoken"; repo = "canto-next"; rev = "v${version}"; - sha256 = "1si53r8cd4avfc56r315zyrghkppnjd6n125z1agfv59i7hdmk3n"; + sha256 = "0fmsdn28z09bvivdkqcla5bnalky7k744iir25z70bv4pz1jcvnk"; }; propagatedBuildInputs = with python3Packages; [ feedparser ]; - meta = { + doCheck = false; + + pythonImportsCheck = [ "canto_next" ]; + + meta = with stdenv.lib; { description = "Daemon for the canto Atom/RSS feed reader"; longDescription = '' Canto is an Atom/RSS feed reader for the console that is meant to be @@ -24,8 +28,8 @@ python3Packages.buildPythonApplication rec { and extensibility using the excellent Python programming language. ''; homepage = "https://codezen.org/canto-ng/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers;[ devhell ]; }; } diff --git a/pkgs/applications/networking/feedreaders/feeds/default.nix b/pkgs/applications/networking/feedreaders/feeds/default.nix new file mode 100644 index 0000000000000..243999553e692 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/feeds/default.nix @@ -0,0 +1,88 @@ +{ lib +, callPackage +, stdenv +, fetchFromGitLab + +, appstream +, gobject-introspection +, meson +, ninja +, pkg-config +, wrapGAppsHook + +, glib +, gtk3 +, libhandy +, listparser ? callPackage ./listparser.nix { } +, webkitgtk +, python3 +}: +python3.pkgs.buildPythonApplication rec { + pname = "feeds"; + version = "0.16.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "gfeeds"; + rev = version; + sha256 = "10hq06nx7lcm3dqq34qkxc6k6383mvjs7pxii9y9995d9kk5a49k"; + }; + + format = "other"; + + nativeBuildInputs = [ + appstream + glib # for glib-compile-schemas + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + libhandy + webkitgtk + ]; + + propagatedBuildInputs = with python3.pkgs; [ + beautifulsoup4 + dateutil + feedparser + html5lib + listparser + lxml + pillow + pygments + pygobject3 + pyreadability + pytz + requests + ]; + + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + passthru = { + inherit listparser; + }; + + meta = with lib; { + description = "An RSS/Atom feed reader for GNOME"; + homepage = "https://gitlab.gnome.org/World/gfeeds"; + license = licenses.gpl3Plus; + maintainers = [ + maintainers.pbogdan + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/feedreaders/feeds/listparser.nix b/pkgs/applications/networking/feedreaders/feeds/listparser.nix new file mode 100644 index 0000000000000..c67df416c5c6c --- /dev/null +++ b/pkgs/applications/networking/feedreaders/feeds/listparser.nix @@ -0,0 +1,31 @@ +{ lib +, python3 +}: +python3.pkgs.buildPythonPackage rec { + pname = "listparser"; + version = "0.18"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "0hdqs1mmayw1r8yla43hgb4d9y3zqs5483vgf8j9ygczkd2wrq2b"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + requests + six + ]; + + checkPhase = '' + ${python3.interpreter} lptest.py + ''; + + meta = with lib; { + description = "A parser for subscription lists"; + homepage = "https://github.com/kurtmckee/listparser"; + license = licenses.lgpl3Plus; + maintainers = [ + maintainers.pbogdan + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 441a80fc071b8..e8a76b3d491ac 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -8,7 +8,7 @@ , gdk-pixbuf , glib , gtk3 -, libhandy_0 +, libhandy , openssl , sqlite , webkitgtk @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "newsflash"; - version = "1.0.5"; + version = "1.1.1"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = version; - sha256 = "0kh1xqvxfz58gnrl8av0zkig9vcgmx9iaxw5p6gdm8a7gv18nvp3"; + sha256 = "1z47h23g87dqmr9sfjl36fs5xjm2wj7z2bri9g0a4jcpwzl5awsd"; }; - cargoSha256 = "059sppidbxzjk8lmjq41d5qbymp9j9v2qr0jxd7xg9avr0klwc2s"; + cargoSha256 = "0rnrdh9ganj63hf9j890yj9pahcgza95z7x020w72mbb4648hq26"; patches = [ ./no-post-install.patch @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gtk3 - libhandy_0 + libhandy openssl sqlite webkitgtk diff --git a/pkgs/applications/networking/icemon/default.nix b/pkgs/applications/networking/icemon/default.nix new file mode 100644 index 0000000000000..b757445eb087b --- /dev/null +++ b/pkgs/applications/networking/icemon/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, mkDerivation, qtbase, cmake, extra-cmake-modules, icecream, libcap_ng, lzo, zstd, libarchive, wrapQtAppsHook }: + +mkDerivation rec { + pname = "icemon"; + version = "3.3"; + + src = fetchFromGitHub { + owner = "icecc"; + repo = pname; + rev = "v${version}"; + sha256 = "09jnipr67dhawbxfn69yh7mmjrkylgiqmd0gmc2limd3z15d7pgc"; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; + buildInputs = [ icecream qtbase libcap_ng lzo zstd libarchive ]; + + meta = with lib; { + description = "Icecream GUI Monitor"; + inherit (src.meta) homepage; + license = licenses.gpl2; + maintainers = with maintainers; [ emantor ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 713156a662144..336e3be074ddc 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -21,11 +21,11 @@ let in stdenv.mkDerivation rec { pname = "zeek"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "00cxz7ad7p62s2glcagzcvwbnsivrv4bmz6rl1vij907jb24hmvc"; + sha256 = "1in25clpbb2vdhms3iypj6r5sp8d1dxjcfn85c272sh7shnmqagr"; }; nativeBuildInputs = [ cmake flex bison file ]; @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Powerful network analysis framework much different from a typical IDS"; homepage = "https://www.zeek.org"; + changelog = "https://github.com/zeek/zeek/blob/v${version}/CHANGES"; license = licenses.bsd3; maintainers = with maintainers; [ pSub marsam tobim ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 8b63483405877..5e3f0bdb5d63a 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -39,12 +39,12 @@ stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.17.0"; - buildNumber = "11"; + version = "2.19.0"; + buildNumber = "61"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans_${version}.${buildNumber}.rpm"; - sha256 = "1h5jbnp5bwy6bpma9a1ia08v7bpz09fm66jsip470k1r7vjjwa68"; + sha256 = "163p67dqry256d454qzk4k4b692kz8s9fcvaxd6gi7zvnsd48ikr"; }; nativeBuildInputs = [ rpmextract makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 2bc223d5c618d..7a735e59dcbd0 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.15", + "version": "1.7.16", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 21374014c8861..08c3d2554c9a9 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -3042,11 +3042,11 @@ }; } { - name = "ini___ini_1.3.5.tgz"; + name = "ini___ini_1.3.8.tgz"; path = fetchurl { - name = "ini___ini_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz"; - sha1 = "eee25f56db1c9ec6085e0c22778083f596abf927"; + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha1 = "a29da425b48806f34767a4efce397269af28432c"; }; } { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 6f6b335430b83..b6dfac397a111 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.15"; + version = "1.7.16"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-7kWf8MXSB4/sX1bjMsfkzgzElS/AYu5VHAKGcqgvH54="; + sha256 = "sha256-mdHsw1Vi+2hrAF7biX3pJqfRaZU2lpw9zUZdcCm717g="; }; electron = electron_9; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 44233d464758c..527af7a4de06f 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.15"; + version = "1.7.16"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-ZSi0OLA5dyPXn1NlZkkhCmWhrSryfyj/O6Ux1lO12ns="; + sha256 = "sha256-/KLTD7IvIp1f1dSUEMMCoknQzZarcP2wDM211h+OJMM="; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 7213332a549a6..63cbb69b187df 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation { inherit version; src = fetchurl { - url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; + url = "https://atlassian.artifactoryonline.com/artifactory/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; sha256 = "03pz8wskafn848yvciq29kwdvqcgjrk6sjnm8nk9acl89xf0sn96"; }; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index c055718f47f32..1344440eafc83 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -52,7 +52,7 @@ mkDerivation rec { pname = "linphone-desktop"; - version = "4.2.4"; + version = "4.2.5"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -175,13 +175,12 @@ mkDerivation rec { ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/ mkdir -p $out/share/linphone ln -s ${liblinphone}/share/linphone/* $out/share/linphone/ - mkdir $out/lib # prevent warning ''; meta = with lib; { homepage = "https://www.linphone.org/"; description = "Open source SIP phone for voice/video calls and instant messaging"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index 0aa2dbf889bb5..decdb18aa0637 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -1,7 +1,7 @@ -{ lib, mkDerivation, fetchFromGitHub +{ stdenv, mkDerivation, fetchFromGitHub , qmake, pkgconfig, olm, wrapQtAppsHook , qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qttools, qtgraphicaleffects -, python3Packages, pyotherside +, python3Packages, pyotherside, libXScrnSaver }: let @@ -13,13 +13,13 @@ let in mkDerivation rec { pname = "mirage"; - version = "0.5.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "mirukana"; repo = pname; rev = "v${version}"; - sha256 = "0i891fafdncdz1xg6nji80jb86agsrbdvai9nwf1yy126q7piryv"; + sha256 = "15x0x2rf4fzsd0zr84fq3j3ddzkgc5il8s54jpxk8wl4ah03g4nv"; fetchSubmodules = true; }; @@ -30,13 +30,14 @@ mkDerivation rec { qtquickcontrols2 qtkeychain qtgraphicaleffects olm pyotherside + libXScrnSaver ]; propagatedBuildInputs = pypkgs; pythonPath = pypkgs; - qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; + qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=qtquickcompiler" ]; dontWrapQtApps = true; postInstall = '' @@ -46,11 +47,12 @@ mkDerivation rec { "''${qtWrapperArgs[@]}" ''; - meta = with lib; { + meta = with stdenv.lib; { description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication"; homepage = "https://github.com/mirukana/mirage"; license = licenses.lgpl3; maintainers = with maintainers; [ colemickens ]; + broken = stdenv.isDarwin; inherit (qtbase.meta) platforms; inherit version; }; diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/networking/instant-messengers/neochat/default.nix new file mode 100644 index 0000000000000..f720f56e6ae15 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -0,0 +1,66 @@ +{ mkDerivation +, stdenv +, fetchFromGitLab +, pkg-config +, cmake +, qtbase +, qttools +, qtquickcontrols2 +, qtmultimedia +, qtgraphicaleffects +, qtkeychain +, libpulseaudio +, olm +, libsecret +, cmark +, extra-cmake-modules +, kirigami2 +, kitemmodels +, ki18n +, knotifications +, kdbusaddons +, kconfig +, libquotient +, kquickimageedit +}: + +mkDerivation rec { + pname = "neochat"; + version = "v1.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "network"; + repo = pname; + rev = version; + sha256 = "1r9n83kvc5v215lzmzh6hyc5q9i3w6znbf508qk0mdwdzxz4zry9"; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; + + buildInputs = [ + qtkeychain + qtquickcontrols2 + qtmultimedia + qtgraphicaleffects + olm + libsecret + cmark + kirigami2 + kitemmodels + ki18n + knotifications + kdbusaddons + kconfig + libquotient + kquickimageedit + libpulseaudio + ]; + + meta = with stdenv.lib; { + description = "A client for matrix, the decentralized communication protocol."; + homepage = "https://apps.kde.org/en/neochat"; + license = licenses.gpl3Only; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix index d39091d4618eb..3cdf1339e3bf3 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -1,11 +1,11 @@ -{ autoPatchelfHook, electron_4, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, stdenv, xdg_utils, xorg }: +{ autoPatchelfHook, electron_7, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, stdenv, xdg_utils, xorg }: let - electron = electron_4; + electron = electron_7; in stdenv.mkDerivation rec { pname = "rambox-pro"; - version = "1.3.2"; + version = "1.4.1"; dontBuild = true; dontStrip = true; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz"; - sha256 = "010v5i8lxfz77cb5cn9va5cbnfa28nzdymk5k2fcpi65jldw1pxx"; + sha256 = "1bd4fba3ac8c20fa557ebfb110f6503d36e6c3dba0401d1073529dcae2c2ec1e"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 05d94b2ef715a..44df5f6be6879 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.39.2"; # Please backport all updates to the stable channel. + version = "1.39.4"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "15lv8jpnn2cx7hmb7pn32cvq6nqvzjflf77bbnvxva5hf9zjkma9"; + sha256 = "11rjz0vawwyny4rpdqsqyfh8pi177xykm69xxcj6kgcncxaxg0vb"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 47a79c7309df4..d4e43ed3a92df 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -108,6 +108,10 @@ in stdenv.mkDerivation { # Fix the desktop link substituteInPlace $out/share/applications/skypeforlinux.desktop \ --replace /usr/bin/ $out/bin/ + substituteInPlace $out/share/applications/skypeforlinux-share.desktop \ + --replace /usr/bin/ $out/bin/ + substituteInPlace $out/share/kservices5/ServiceMenus/skypeforlinux.desktop \ + --replace /usr/bin/ $out/bin/ ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix deleted file mode 100644 index b0819ade4f33a..0000000000000 --- a/pkgs/applications/networking/instant-messengers/spectral/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchgit -, pkgconfig, wrapQtAppsHook -, cmake -, qtbase, qttools, qtquickcontrols2, qtmultimedia, qtkeychain -, libpulseaudio -# Not mentioned but seems needed -, qtgraphicaleffects -, qtdeclarative -, qtmacextras -, olm, libsecret, cmark -}: - -let qtkeychain-qt5 = qtkeychain.override { - inherit qtbase qttools; - withQt5 = true; -}; -in stdenv.mkDerivation rec { - pname = "spectral"; - version = "817"; - - src = fetchgit { - url = "https://gitlab.com/spectral-im/spectral.git"; - rev = version; - sha256 = "0lg0bkz621cmqb67kz1zmn4xwbspcqalz68byll5iszqz9y4gnp1"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ]; - buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm libsecret cmark ] - ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras; - - meta = with stdenv.lib; { - description = "A glossy cross-platform Matrix client"; - homepage = "https://spectral.im"; - license = licenses.gpl3; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ dtzWill ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 6518f73a2299c..d4cc5293a9beb 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -22,12 +22,12 @@ let in mkDerivation rec { pname = "telegram-desktop"; - version = "2.4.7"; + version = "2.5.1"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "1j2v29952l0am357pqvvgzm2zghmwhlr833kgp85hssxpr9xy4vv"; + sha256 = "1qpap599h2c4hlmr00k82r6138ym4zqrbfpvm97gm97adn3mxk7i"; }; postPatch = '' @@ -80,9 +80,6 @@ in mkDerivation rec { # TODO: Package mapbox-variant postFixup = '' - # Nuke refs to `tg_owt` which is introduced by `__FILE__` in headers. - remove-references-to -t ${tg_owt} $out/bin/telegram-desktop - # This is necessary to run Telegram in a pure environment. # We also use gappsWrapperArgs from wrapGAppsHook. wrapProgram $out/bin/telegram-desktop \ 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 48499bf9f2c74..2853418da0e33 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, yasm -, pkg-config, libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm +, libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf }: let - rev = "e8fcae73947445db3d418fb7c20b964b59e14706"; - sha256 = "0s2dd41r71aixhvympiqfks1liv7x78y60n0i87vmyxyfx449b5h"; + rev = "6eaebec41b34a0a0d98f02892d0cfe6bbcbc0a39"; + sha256 = "0dbc36j09jmxvznal55hi3qrfyvj4y0ila6347nav9skcmk8fm64"; in stdenv.mkDerivation { pname = "tg_owt"; @@ -14,11 +14,16 @@ in stdenv.mkDerivation { owner = "desktop-app"; repo = "tg_owt"; inherit rev sha256; + fetchSubmodules = true; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkg-config cmake ninja yasm ]; - buildInputs = [ libjpeg openssl libopus ffmpeg alsaLib libpulseaudio ]; + buildInputs = [ + libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf + ]; meta.license = lib.licenses.bsd3; } diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index b677d82dce47b..8423beec46874 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -1,27 +1,27 @@ -{ stdenv, fetchFromGitHub, openssl, lua, pcre }: +{ stdenv, fetchFromGitHub, openssl, lua, pcre2 }: stdenv.mkDerivation rec { pname = "imapfilter"; - version = "2.6.16"; + version = "2.7.5"; src = fetchFromGitHub { owner = "lefcha"; repo = "imapfilter"; rev = "v${version}"; - sha256 = "0f65sg6hhv6778fxwsz4hvarbm97dsb8jj0mg7a9qs273r35pqck"; + sha256 = "nbVwbPkNbJz4GHhvOp+QVgiBqKA/HR34p4x3NXJB7ig="; }; makeFlags = [ "SSLCAFILE=/etc/ssl/certs/ca-bundle.crt" "PREFIX=$(out)" ]; - propagatedBuildInputs = [ openssl pcre lua ]; + buildInputs = [ openssl pcre2 lua ]; meta = { homepage = "https://github.com/lefcha/imapfilter"; description = "Mail filtering utility"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix index c7554fc84b085..ce13a4de8d092 100644 --- a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix +++ b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "mlarchive2maildir"; - version = "0.0.8"; + version = "0.0.9"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1din3yay2sas85178v0xr0hbm2396y4dalkcqql1ny9vdm94h6sp"; + sha256 = "02zjwa7zbcbqj76l0qmg7bbf3fqli60pl2apby3j4zwzcrrryczs"; }; nativeBuildInputs = with python3.pkgs; [ setuptools_scm ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 8cdd27653e235..b1905359cd3c1 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -1,22 +1,31 @@ -{ stdenv, fetchurl, config, makeWrapper +{ stdenv, lib, fetchurl, config, makeWrapper , alsaLib , at-spi2-atk , atk , cairo +, coreutils , cups , curl -, dbus-glib , dbus +, dbus-glib , fontconfig , freetype , gdk-pixbuf , glib , glibc +, gnome3 +, gnugrep +, gnupg +, gnused +, gpgme , gtk2 , gtk3 , kerberos +, libcanberra +, libGL +, libGLU , libX11 -, libXScrnSaver +, libxcb , libXcomposite , libXcursor , libXdamage @@ -25,21 +34,14 @@ , libXi , libXinerama , libXrender +, libXScrnSaver , libXt -, libxcb -, libcanberra -, gnome3 -, libGLU, libGL , nspr , nss , pango +, runtimeShell , writeScript , xidel -, coreutils -, gnused -, gnugrep -, gnupg -, runtimeShell }: # imports `version` and `sources` @@ -58,9 +60,9 @@ let systemLocale = config.i18n.defaultLocale or "en-US"; - defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources; + defaultSource = lib.findFirst (sourceMatches "en-US") {} sources; - source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources; + source = lib.findFirst (sourceMatches systemLocale) defaultSource sources; name = "thunderbird-bin-${version}"; in @@ -75,7 +77,7 @@ stdenv.mkDerivation { phases = "unpackPhase installPhase"; - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib at-spi2-atk @@ -110,7 +112,7 @@ stdenv.mkDerivation { nspr nss pango - ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ + ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; @@ -118,6 +120,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; + # See "Note on GPG support" in `../thunderbird/default.nix` for explanations + # on adding `gnupg` and `gpgme` into PATH/LD_LIBRARY_PATH. + installPhase = '' mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}" @@ -158,7 +163,9 @@ stdenv.mkDerivation { --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \ --set SNAP_NAME "thunderbird" \ --set MOZ_LEGACY_PROFILES 1 \ - --set MOZ_ALLOW_DOWNGRADE 1 + --set MOZ_ALLOW_DOWNGRADE 1 \ + --prefix PATH : "${lib.getBin gnupg}/bin" \ + --prefix LD_LIBRARY_PATH : "${lib.getLib gpgme}/lib" ''; passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { @@ -168,14 +175,14 @@ stdenv.mkDerivation { basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin"; baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Mozilla Thunderbird, a full-featured email client (binary package)"; homepage = "http://www.mozilla.org/thunderbird/"; license = { free = false; url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/"; }; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 4a1472fde7172..b7858ba14e99a 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.5.1"; + version = "78.6.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/af/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/af/thunderbird-78.6.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "87cb38398aaa5af68e562a5fc6d20d3d3477d871979bd4a635c94c440e66a482"; + sha256 = "7f8fd3a1f0e869ee03a4f120c88b606fbe4ae35d9865394fccd291caa9ae7069"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ar/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ar/thunderbird-78.6.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "935efae7caa116e16c341d64634954d77cafbc5e28626b46f5385b8416060f51"; + sha256 = "73e7beba4e5a2b9cd92ded3ee8e662be9a80d65d59790ed1d5401b5a61c8d147"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ast/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ast/thunderbird-78.6.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "a5868dc7987529790910e638b64b15295a2d57e449fa515f4e17a4ab88a830e6"; + sha256 = "890cda9e6a9582d43d61c9b4deb2241f46d34dbac5516d9a808dfbb472a22eec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/be/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/be/thunderbird-78.6.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "af52b29567ce26159890f70fcdccd4cafd49c7fc75c620bb606727fd27b7049a"; + sha256 = "b951394def900c975b2796e47d948c03c59f0fde445f22d1b9a0d89ae8b7dd83"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/bg/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/bg/thunderbird-78.6.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "91856a4745a8bdefac7c2b0193766a4f0009378dfe941dbbe1afcae2ffae2337"; + sha256 = "2440a8ea3a49d4fe7a84b0c6e67a98889bf98c5f828699bd980705c100a0e585"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/br/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/br/thunderbird-78.6.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "d5ba5fe368c99377a264d8574607335fc4317dad447bb38fdc6a5b53d2e95b49"; + sha256 = "74b48030e64ff509379dd92d08734804006a8cc6176c69e387e03596138c48b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ca/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ca/thunderbird-78.6.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "396a1d7b668c7f47b56d7cb41e6e914f03e9e517a14b4698abedb501037ef2c1"; + sha256 = "4b951a13352db2cc90aadf94c1e57bc5b40660d82dab855aa80751bbce9aa3b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/cak/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/cak/thunderbird-78.6.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "914b76ad8268db608be0595039a68189146ded384c23407ccbcd78a5e74e19ae"; + sha256 = "bfb2ebc8a6b376603b9e310ad664a099725a29183c67b02ee13ecf3eb9a3bdac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/cs/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/cs/thunderbird-78.6.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4b62702cabecfbb2567b19446f405936c9d948dad6f65a2e3f21809d4f2b1176"; + sha256 = "de30e9d948ade3c82b7ebd58a3bbed5e880abcdb2d9c58f8e64d9d3d78bb336d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/cy/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/cy/thunderbird-78.6.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "736d245bd7766ac8c611a6801b3769a84baf4abae94818e0cfcadde8521850ad"; + sha256 = "b7d0bb95acb861c453d8649673d9e582920a6df6a9662b8a6f996636d54c68c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/da/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/da/thunderbird-78.6.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "53143b51b84ee74ee9131d3b3b80e2cf873e5a8c22478c87db34a9d2ac34607a"; + sha256 = "2c4765b34f1d63a9eae942531b7f489150d6850f68487565082ea18c94f3ad0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/de/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/de/thunderbird-78.6.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "2f3a4d8bf96e9653dd3883ac4399c650e87831d7df137358401966683d382e6c"; + sha256 = "e29280a519f4eca06d4e5862085d8fb8cefb9577918ba953cdc6f63ffc44a6ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/dsb/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/dsb/thunderbird-78.6.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "81a3674dd2495da673a2fe3e3d200d7cadf83f9c67ff92bf2d607f6546bc2f38"; + sha256 = "d638be5a999fd1b287628b449235e9995169c06c2cf46d1f7e6de282bf4357b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/el/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/el/thunderbird-78.6.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "651e8f535b2518bc4e56706cfb76da6d0e35d4fec031f8426cbefb404e4790d7"; + sha256 = "34cbbca7eb8ecd5078d52d429b76ed0b5334398040d6e00aa5b5926bf8eeaba8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/en-CA/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/en-CA/thunderbird-78.6.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "775983115d98e3581db993f6202fdad1de6b23d38e5bb7edfd965ad6bc0ae425"; + sha256 = "d50be05404a4b51e3a9c2fc4a73d75504f11e12a7ba7331ca43d5f078f462303"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/en-GB/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/en-GB/thunderbird-78.6.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "d0a3569c76b85fdca01e5098cf279b08a63d2d9023e92cadf3f8dc136d76c619"; + sha256 = "4d11d73b268369117861250f4fecd5c6d19a904145caaaeb7ee86c7eb9e63f9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/en-US/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/en-US/thunderbird-78.6.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "4363d8fd759ac4f4783eeb76726c8cf22e5afb3c171f26fe5cca5ab194ab6959"; + sha256 = "6691e528ac3fc88a023507e1172d67daac235fa1fce97e75e6fbd7072a493e0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/es-AR/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/es-AR/thunderbird-78.6.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "3a04a2e42935c97c7ef003e4a690c0433783b57ce56700f07ad8b590e48b4ad0"; + sha256 = "2f45d7f6e42fdef4f8bb8ab815879157cd962c91afa352a35f8cbc3fcf52fd82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/es-ES/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/es-ES/thunderbird-78.6.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f70a3feb09b79153d18e2a382017abbd6e015c78d4d55ff66f8b199b450172c4"; + sha256 = "7bf50cefecce82e20c06441f003cc51eb7cc16d3a0e55a118213eee78e8b8494"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/et/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/et/thunderbird-78.6.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "c739f5306a2526baf74e57a029371390d02f8c119681b0f154481ae32c67c18c"; + sha256 = "2b2c624808f75ae0d713ad37e9959ad518ae5702caa10845fb3aa8089e77bc9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/eu/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/eu/thunderbird-78.6.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "9f95f4f1ec40e2732e053e68b31529b827f95876ad890d752f5380158f53b9e6"; + sha256 = "3495821650563af2a62f36f928fb7503568de920211b9ef2f21904884d4fa3ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/fa/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fa/thunderbird-78.6.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "e53dd458656ee9f39e996042016256949c974161c51b1bee63a401d90d59bace"; + sha256 = "90b9ff389550e5801bc7ca7e1e4d7db5b281081bef2d0d30b7c2e9799e8cd0c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/fi/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fi/thunderbird-78.6.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b0a96b08e986e49ee6526ab098fb0d44700b3a2aa7f96205b318fdd4b938ef51"; + sha256 = "cd5819b7ed9e3017cbef8e1ca33cb92e1804fc8ece9edf6a74133db90b61ee6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/fr/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fr/thunderbird-78.6.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "872da741245da7466de58d766a0362983d59a111a65a333881d3636defe00eb4"; + sha256 = "82b382d1ea014a26a397c3fe06c586732df756104533c7450494ad43b11e43a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/fy-NL/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fy-NL/thunderbird-78.6.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "d57862f51ec01e63ab77916ab352276b7f4992b089508dee0c9c5d389ab88d95"; + sha256 = "3b4b0c4a23ad63f2d152eb8741a30fe4092c2d37d1bbb2cd56eb75c85d885f4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ga-IE/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ga-IE/thunderbird-78.6.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "bda41b8eff5a5004f753944c49f15ddbd1f76c19b0310481251e04ff64309597"; + sha256 = "093b76080942d3e7584f7948dc65003c20878e8bf4bec4808669f012183cf97f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/gd/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/gd/thunderbird-78.6.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "0671af342859574cb96dbe119d76d7ffa92a8c3fef11eee2a03f662ea71fb84a"; + sha256 = "a726c67ab384b58c3a1ff84a3a1fe95f73219996e7e26f5dcdfe5dda30d34cdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/gl/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/gl/thunderbird-78.6.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b458d6f79914fc4c551b3fa4444dc5ad4fa8d3310907a33a3480bf363bcdbfdb"; + sha256 = "b731c512c61ece7b811d74e5f40cdae742207463799cccfa9906b43f58d5f2fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/he/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/he/thunderbird-78.6.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "146f2a8417827d2d6352f7cc20486ecca8fd1e0ad384d4eb2d8b2635edf2075f"; + sha256 = "d15591239235d2f7debc8454e65c1e67101b8f32901fcc7543025986c524b156"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/hr/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hr/thunderbird-78.6.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "5c510bd3a8f8015e5c8a7c0cff401e3557b0cdca83bff77d2384c8f75f287152"; + sha256 = "003d02062016c8f13038e61f189b7ebb75753ffd9a55879e1f8fd3ee1c1f2a2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/hsb/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hsb/thunderbird-78.6.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "605ae5746f0df98c7a561550da9cc938d0e06a222f422910ab118fa89d09e793"; + sha256 = "2325fd29cadc8c824ddd90ba7d0975ca42c2d9964c62269f0361b5318274155f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/hu/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hu/thunderbird-78.6.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "7d42f5e242e04d06bb9abd9bde8fe21571fa13f91b027369a048447d4de8526c"; + sha256 = "15650cc17e75780f17927ced485a03a23dcf771dd7d8343b28acd0ae1f0e1f9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/hy-AM/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hy-AM/thunderbird-78.6.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "74b0b31089be36c0538eb24c98e57123f24599b4122aac5b08c4eb914f6a8f7d"; + sha256 = "c20a4f0ccf2bce093986e3758784190215bf19d31469f6bb51f5a494ed54fb03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/id/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/id/thunderbird-78.6.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "291ad6b1fcdc537e723ee76cf0a40a3084bdf1ebec68fc3c8c54714618f5d790"; + sha256 = "286eb0484f9a4b9c2d24dd836abcc07b00218a6c870535df1e4947482de1a79f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/is/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/is/thunderbird-78.6.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "188e2cab8e00421b8a5f9c9a174e8a529ab404a0f4f3976797e41848eb0abc4d"; + sha256 = "b291df9b76800c56424ed8c9ad8e55be68f2606968abef2eb83ee3c86d56fc6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/it/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/it/thunderbird-78.6.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "12daeb5314ae81a82ce95c35dc9e34d676fe8b666a84a38aea36367b52aa2c95"; + sha256 = "51d112544b67c44d82b4d0f54bd35f0dfb485917ad72c09ce6136a8750e58eb0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ja/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ja/thunderbird-78.6.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "cdd41967d60abff6053f1736375cbbdb521bbdf5aa25110ca8e08bb365c853ca"; + sha256 = "931815f8f2e0e3a9e3b9eb150fe8f0112b26537b02cc0c0c0dce9c14c1959ac9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ka/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ka/thunderbird-78.6.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "9548232d8df327e6282b5413d904d5742aadfa75574b1333a235df2097337032"; + sha256 = "d51b241842f8da9d6cfc8307b11b73fe813d46a7d6cd9651c46e1af18201e89c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/kab/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/kab/thunderbird-78.6.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "ca35aa36ed5794661372e76f24dd6c98d11d35da76aff5396215ebe9331aa881"; + sha256 = "935d2e485aff93ee91c20710c286cb591379f5fae1a34851454707710c75df88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/kk/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/kk/thunderbird-78.6.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "dd90fff1a4ee8380e03e59ef324298d1591833a021d14a11fdb2829cd3a934f3"; + sha256 = "4534b9c69f44c197997283f455d4b692ff96df122e9d633288d2874b8657833b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ko/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ko/thunderbird-78.6.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "4dae3766bf420a0cfb5473fa95356f0061b657a7ebfdc808b69a8e639564893b"; + sha256 = "bb083026c53734d3956126a7bc11f1e02e122e463b0f8cb72757cc7cf94cb911"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/lt/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/lt/thunderbird-78.6.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "de4b448d9651692bc4eb38447d94c94e37d93dae816edb5f3936d56a58aa41af"; + sha256 = "a9cd61089e2898a3e27cd0d10d9295c295b579324a30ff58f7500c0dd9fa1977"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ms/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ms/thunderbird-78.6.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "08593e72643de8f79b6d90a0c41d6031f915097d3f28f1e7e901c21caa0ab037"; + sha256 = "f84ac7f403802271c2730979dd7da85ec976d970aa39c1f50215ba1902449245"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/nb-NO/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/nb-NO/thunderbird-78.6.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "21caa07be03725788c41fa527e7656a0467194e8a498de87f2455b571c4e14b2"; + sha256 = "98fd61d91149b26750f06e12f64605ffe04f243d96c5ead0d11a2a600c4baa7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/nl/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/nl/thunderbird-78.6.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "7c1c00a8e03d0a8e4fa9cdc3b4acce51215e9f273660e48ad76347e6003a1985"; + sha256 = "44dbe77dbfb8d74c2c79052e1152e0da0a751d0cccea5b643c5019704454b0ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/nn-NO/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/nn-NO/thunderbird-78.6.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "103bc1307f47c20102e14362fcd6da696eb122fe77f680e70cd0849c9c03c47a"; + sha256 = "e88e668c434b5b2469ef8268985015735ba5ff8639a1c670d1c9d42e1dd0b30b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/pa-IN/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pa-IN/thunderbird-78.6.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "388d01d0881573164816d7ddf6a08c17ad966616f1c8e8e429f821d2bb179a62"; + sha256 = "388b87f10db2a0dc9c73580ccc5248c492d6274766e4350981f8289db39c95cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/pl/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pl/thunderbird-78.6.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "160651e72037bb89ac62534714ce9ecbebdec0cf1f8a6127396c68ab531745f9"; + sha256 = "cc0e7c7bf4fd33ab255b1bcca808e6ae84c9575b3555228f84da8dad83b02d2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/pt-BR/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pt-BR/thunderbird-78.6.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "6d2064a6ed4bb684384f7e79b61cfceb66a9a26900e9947b3666c36d6b8793cd"; + sha256 = "a8b4b7db5ed2a45af8bc595c85f15f9ea78d2a790bb62a9e419b7b2c78616a66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/pt-PT/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pt-PT/thunderbird-78.6.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "2ccc7a3d9d845f1a3e2ad3869cbd4cefa10e44992c27444a599f6f1429070f32"; + sha256 = "c4504cebf2b2c831ec94029605b3068ab1cf220d3cce33b085d658c20fbf4dc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/rm/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/rm/thunderbird-78.6.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "05e45497c19d46292617de4f247f014f7b14a684f74bfd314caf408416dc5b19"; + sha256 = "b1be40d4a3f6f26c9a06e3179244ae2ad9c9c259e76cdd695cb3f881e43de919"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ro/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ro/thunderbird-78.6.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "bf01cf8c987e46f03236dbaab14aa551464019f471aa111299b6c7538e995f80"; + sha256 = "305ecbe685a107461aa3dad94e7b74d9f32b343a3d9813cf7d570e0919d5d931"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ru/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ru/thunderbird-78.6.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "a3cbdfa26ff487d0efdabfa9dc324b75ec1446964f1c0192afcd67565dfc4a51"; + sha256 = "4d49f15c2c9e69a6156e89017c71f5cbda3114940bfdf273efd0e82dfcc3457b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/si/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/si/thunderbird-78.6.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "fb26eef7b0c5b233e41f8d4ad79f11aa7d0db21b155bf0d9284881cabb51f6e4"; + sha256 = "9d108c3b3d54d12c5008f0d77c4a6741ab94c7fcfec1cb4ff59bb2730938d01f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/sk/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sk/thunderbird-78.6.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "d462f2606bfd7f6e0e45334a68d266889f0f9f927f08d5b92c39329711a8c4cf"; + sha256 = "a6e51284b554fd6a8970757d519870098baa26d3fd23561e335105ec5bf836ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/sl/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sl/thunderbird-78.6.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "b6011aefaf1eb60c8849b4ecc7a7a6fa0a72def8ba690f5b7ca61de3e089c9a4"; + sha256 = "99b80fb6efd174beaf885e3d5451557a353693158ef147c931aa4d8560966122"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/sq/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sq/thunderbird-78.6.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "aeed36c0d6129dc58d496f8f6177a88950a4c4cfe2e4ac157fb389ea79488b11"; + sha256 = "5bba738143daec5c687fedf566052c9d387a87520e510acdb963ae80c5d24b3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/sr/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sr/thunderbird-78.6.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "f55cb398b3e6420acf6791d9ab5592b9915d299c5111ea917934b5729d22dd7f"; + sha256 = "c18424e503d87ee7ea940a4d9551b9ec51a90b76b73180c89541872dbba27674"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/sv-SE/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sv-SE/thunderbird-78.6.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "036b4f2b3d6cd24bcdcdbc1da1f44df2fba012f22ab96d0840a8c7ae0b945055"; + sha256 = "d0eb7a8a1a6248e40142a62b61f9fe3e78bb8c277c9734d821358e0a075d5184"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/th/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/th/thunderbird-78.6.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "316ae39fb02b9ad1b28bbe7a21342e5e85dd7593978b4935b7be20253fe6b761"; + sha256 = "04d3465fb8afcff051ce9a578901f3e9a8fbfab65f31cd7245b0b9321daa102f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/tr/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/tr/thunderbird-78.6.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "73811e185274d880abdb15503a928a537428460080245426a07cf1c01e38f1c6"; + sha256 = "46acaf32f9f035dd320d4e28d6b36ef8ce2d8ff5f753cfb6a7b02f37e8edb09f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/uk/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/uk/thunderbird-78.6.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "8ff9e333cf16a02e7888f297851b5a9316c5b57cf546f592f12d2aab6e3bed48"; + sha256 = "60b0be6207532039958f03a81e5fdf070d15cd624a0583c4d8e87e0528ccd240"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/uz/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/uz/thunderbird-78.6.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "899c0c8c886fbaa6a6609a500bb374797bd36272138a6fcdc6aca7c7b6a6fe66"; + sha256 = "070963c90b858e9ab75cee1490671ec3f9f46190896eca554fde0ced205d0d44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/vi/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/vi/thunderbird-78.6.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "13afdad34f64a1c96f9612c10c8af880e9718ae10d8a1578bc397b238a936dbd"; + sha256 = "9040ed756aa19c0e850391bd9fa148eb0fbca45b84eea888c874a9c93ee0428b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/zh-CN/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/zh-CN/thunderbird-78.6.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "00a1d01acabd210ba70ed6d0842ab5e1674109c7f39f561e8295d1ffd5f80a0d"; + sha256 = "caba2b9f3fabf1231b947c578c9761a241178f732c110fcd4cf620146ce5002b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/zh-TW/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/zh-TW/thunderbird-78.6.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "19b84b15a6bbf593a342c874822764bd73022d2c846fe20a6d7d91aceeb1ee15"; + sha256 = "b48378e3833a0710bca60cb9c87396f0163cf9cd6211725ea711e116557e5abc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/af/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/af/thunderbird-78.6.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "4c1487a6b823a76d477085e66b377f536f2cfd95b4ddc6804b97c792af77c554"; + sha256 = "b4ca4cd2535fb02c059db2783f2428634373730217d420530d7c2f6441191fe7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ar/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ar/thunderbird-78.6.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "d33576a1d8c346195a20c8a222281d682d14f604654ff173eb28ca8a9343574b"; + sha256 = "29c287ff2ce37f3d4c23770f85aa220d7b9265df2b188aa38730fca68f8ea40b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ast/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ast/thunderbird-78.6.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "09d68977bc121e562f3c697bd1d87b21250c8a0bcac013940e3806d4a69a749d"; + sha256 = "e1267edf8d35bfaf1f2bab751b5235855ce9ab768acc607ff308021dc917cd8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/be/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/be/thunderbird-78.6.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "bb58501c902788b2d1f8f308468aa57447a15979cab59dc89c27e3738748b6d9"; + sha256 = "1359027429e2c1ed2535f0878105bc0485f52b569aa342246d380acd1df13e4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/bg/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/bg/thunderbird-78.6.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "373bd3548f518a4ae56e8a103b64eb76c3139b984a5af8013de56b133a0d44c0"; + sha256 = "4e2d1a02d6ef6ee123c68db8ff299037cbfa017334599f5e3ac7114ee3e8874b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/br/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/br/thunderbird-78.6.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "40934c8ec7070ad29cb0111624de431a0cdeeff9c7c01d8781444e33f65acbca"; + sha256 = "526e73827d595452c40bcd2066885d41a9497bf7d61043a5236d600cb9202e94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ca/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ca/thunderbird-78.6.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "fbce4213fe7564f2af3f980f5844961cac9a7ec2a30b23d7cdd4e5db6aa4ebaa"; + sha256 = "73605bd265262a8f538b7d15b26915ecb030a76824a09192e7b2e897ac5affe5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/cak/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/cak/thunderbird-78.6.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "2aaf7ea23606be03f5f7168aaa4286760f236d084babd1f81540f8b62b37962c"; + sha256 = "bbdcb9447938bc2ae8b4dc0a5a250cf82e316c7ef56abca2962f871abf9d1d4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/cs/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/cs/thunderbird-78.6.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "880e36431f76161674fdb9f2902c9d5487bed528a198722458b7e6e76e80e9b5"; + sha256 = "4052bda928576a30657dc4087bdded6ea2339e271bff36194bbd37e610f55d13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/cy/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/cy/thunderbird-78.6.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "eddb4dcac8063e5b245eb1c095c4ff98cb03714bf5b07f0366b89d670a9d95dd"; + sha256 = "d3b337be4b64903d075f8e2269ff5f88831d5a88f24a56deead19ea534867d10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/da/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/da/thunderbird-78.6.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "2425487caaab7979f504d37cf6b100c7cb030e8e5495b6723fa4f953348e4f40"; + sha256 = "96080cee994410b59935c0baaa4d8bc0c592d1654242b00540b3b1997398951a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/de/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/de/thunderbird-78.6.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "81df3e5ba46fe5959f785c06bef0b70daa55e8f8721cfff0bf55a76f7343b32f"; + sha256 = "46b4c8b867fbc4f5ed288f0c503a776a256c229799601d7810ac51b73685d6a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/dsb/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/dsb/thunderbird-78.6.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "995d3aaf3df22aa3166f161b98113fc25b813dc7cee2743b2bdd6913b4a620c4"; + sha256 = "f1b8576a1c5ed9dea2b92b10b03e2f16e17207c1f5dce4f83556b11a846de754"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/el/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/el/thunderbird-78.6.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "ad5162a76dba9c37e2542fa7ed08c63edce9955600e9b50889abb03e352ddf23"; + sha256 = "01d559767ff8a2562b81c7e42007993065b4d46319fe4890e157a2450a34875f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/en-CA/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/en-CA/thunderbird-78.6.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c605520e5e65449855c355147f18b813f66d38dce52e8d3a23b90afbec5bcbf1"; + sha256 = "99571e51cc28c9dbc5aab42fa5d5f7f680fdfa287f7f8b96c5548949155735a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/en-GB/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/en-GB/thunderbird-78.6.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "63b0d984ee8296c5185ed1aab279a0ef065986d989edbd0a7683b9db6a6d94bb"; + sha256 = "e515ef917801e0fa67b9d4821f7185b21e36b35b7df8bb43b6a917851bcae753"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/en-US/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/en-US/thunderbird-78.6.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "b5404037f2678d36acbb225f43d426a86db9a4828a69b1beaf44dc3b5264ae7e"; + sha256 = "cee59a70210f9fc8672a914179c957d67556b068d8ce9387c01636e89e54aba9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/es-AR/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/es-AR/thunderbird-78.6.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "cefe0ff79bacc9c16fe649c0d7b4f932afca6ebb10c8426fac527485e92f4422"; + sha256 = "e30605e7460ff80a1c26107d0393d7cd12ecfd95d55f256db6f808076d03c53d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/es-ES/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/es-ES/thunderbird-78.6.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "de7c6685c4e73ee334faf83c809b2f45d55c971282ba99aecfd5d1c8b05577da"; + sha256 = "0e2301dd592c06a2628aeba21f38fe4b422ed2690531c1487e958c6cea1b236c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/et/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/et/thunderbird-78.6.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "e5174b12c61221436a5926224f61f218bfe762086f1d5bb814af5f7708592392"; + sha256 = "d15684c68e9bef8902e9dcdb87bacda263953cc93ba7368b69fd318739b58fdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/eu/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/eu/thunderbird-78.6.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "66bfbb4edc775117a6f048f52084fff9828633166ac6234a7c1dc0d67311677f"; + sha256 = "4144e7de84ce0a6b39d8c29a96221532951c76679a8ac5a85aa07a62b99680d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/fa/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fa/thunderbird-78.6.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "072163a9d1a94b1f5c297c794791b4bd3e7f7e6897e7f7615df59a9dd2232a52"; + sha256 = "028ac9a6ad5d6e7360e597d961a7422238d96cda848042975ececec6f3a06aa3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/fi/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fi/thunderbird-78.6.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "9c269f267251bee9828acfd78d04bf149767dfe5247ae4f53ec5b0bd65c410ba"; + sha256 = "ee5adee4c249edd9b61fcacc0a2150d4471a7897aa1057fe3ea04e16729de966"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/fr/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fr/thunderbird-78.6.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "6ccfac2b5d96491c4d5dc7b00e4458617ca68fe07917941559534a31424c977c"; + sha256 = "d5d0190541184198a6c628b3c79c7dc96ec911ab195ed3419f33c4817d401e01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/fy-NL/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fy-NL/thunderbird-78.6.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "1b470c45c9d52a8a84c59dbb4ed0e6966d124ffdc3ea865e4d02289bd39b346f"; + sha256 = "c7b8ee6e8b66a6948f80f10e1ebf2d61c70e5be439f197953bff91f499fa8d51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ga-IE/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ga-IE/thunderbird-78.6.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "a1cbb9a4c1bf91f920da9e4e0e39e6ecff0a8c87413898c1930ce69dadad9a26"; + sha256 = "32a1d8ded34b26136b2884d24f31c5b08c965c10061758b87df9510395f8dc7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/gd/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/gd/thunderbird-78.6.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "909be2cc362ed839f373eb22d27c5f3c569b1c82fc2ba5aaf270d605029d336c"; + sha256 = "a65ff1d77deb34ed46bb84ab480afad20fcf417f39c714021ccd83b4a9d3212e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/gl/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/gl/thunderbird-78.6.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "8ffadcffd16aca8befd4b9c230b7da750e6a694add7ee465227a0c3f31a5c655"; + sha256 = "87660c561fc92396c1eeafb82e907fbc2670b6649e2c7f0bdc73714fefa3de55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/he/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/he/thunderbird-78.6.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "a9242889345131a405d138d0ec8e470eb49c59ada18b1e8f78004f307ceb41b1"; + sha256 = "1e5c7324c57de9e5e2a87dceb1d41994a74f55e108e8d97161e0fd428f6b197f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/hr/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hr/thunderbird-78.6.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "eb1f5496811677e28b2ed034da40ebf1fef324673e0f3acb2c21f0db5c71f592"; + sha256 = "cad204c16e1b8ee26809321aa27c73220e64bcd86d261474c636d088ade006e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/hsb/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hsb/thunderbird-78.6.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "643a2b11a0775a71a8fa6c25097cfe297e6bc190fb29eee18ddd3d16fb61d989"; + sha256 = "9d3e8988b5e8a3f089a0334304e255a716bc24f4ec9b08dd6594b7ddb4daa3cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/hu/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hu/thunderbird-78.6.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "61d91bed542a7e014a8d11e46e1b3d97e8bef1303bba397b3d4da0585b1e68af"; + sha256 = "f46e9d49a74ccb2172c78e6e149149ff49c0be7c93336c62f8c17b30a1b1d15f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/hy-AM/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hy-AM/thunderbird-78.6.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "2e6739d14a45529ed2a68abb8ed03ad901b4e7770efebd382f6e9626c86da036"; + sha256 = "f3f7e033489907339055d0ef02abf4a423434248b1a10623736fdcf09a3edd79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/id/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/id/thunderbird-78.6.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "8753bc4c7292cd0c6ee382bb5572e432222e7c39ed739904d91ed1ece5a8197e"; + sha256 = "581cbae2f96a616d29d30eda0dad30992eaa7fe71f65c20af10f528d130d83d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/is/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/is/thunderbird-78.6.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "4f624262b72fce7d258b6f7c264f7d2266ebcfdd59fce895e4e85c72fa784637"; + sha256 = "8653b1e05517a723a4113995e0e69a73fa59196f5625e2c1b0e51d9d60561646"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/it/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/it/thunderbird-78.6.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "6298ce45c4a659e47877302d61a50dfc7e0634e7c3e7036aeec49da5a2839073"; + sha256 = "98faf75b5216cc75c2348962769fcdaa98ff59c4f4870b44cb6e7a69b7b5e9bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ja/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ja/thunderbird-78.6.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "85a7b01f65c79b0e13c4f8a18f3950f0a250f380fc8756b8fb1709680a148554"; + sha256 = "ad34916c36ac06eec4c1a900ff33639c6238e01c6426693261433b9bdf44ea91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ka/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ka/thunderbird-78.6.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "f7b18243b9985b54eb8684b62bad47b7b021eb959f467fec9876c866d92b1727"; + sha256 = "c3468772b8667784814f6d323a74aef24f561cf3fbd2c5dfbfed16f73e7e7c6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/kab/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/kab/thunderbird-78.6.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "cc8eb77d0d0ea95a1e2b13db51da4f18a9500aeacee1cbe505da67f2b6a9b979"; + sha256 = "1ba665c91e38df62809a601223238dc3c34a50c96e42e5792b145eb9aed3aef7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/kk/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/kk/thunderbird-78.6.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "6999faf34774806e1e4257a139dd97dd50a889a7729fef4f51a8b41bb4ad169e"; + sha256 = "651fda1baa62acfae3f13bb65096368719461d206ce45b84a3ff5540e09d9e24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ko/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ko/thunderbird-78.6.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "42b0bf1ebfce252fdfca3ed8de9f227bbb054bf591e6155b716b18e9613a9cff"; + sha256 = "49b82df2eaa66e658b4ff0f84af7b128a92eddce7e9ce129f0f28b8239367967"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/lt/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/lt/thunderbird-78.6.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "6ffe9b52189579bee34604499649901be5c8be2a026eb70a33ac9eb4e3b21880"; + sha256 = "6d263e236457576a0e853fd0b00711182c34c32436f65c8fc952aa2810fa500d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ms/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ms/thunderbird-78.6.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "640942eb04d84d24bd28cf5e49e57497934810394b50693bad591cf3b783e1bf"; + sha256 = "45b050930b8357e3a988701d46234ccdd43ba7b38e56b88d157dee6309c375c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/nb-NO/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/nb-NO/thunderbird-78.6.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "c0d35274192ae664314e91fd9364609cbbf142f8177d37210c9c49fdf8d31086"; + sha256 = "23760a375705d8c3d22aaefab60c9a761fe73f5d6c97f3a3621312ba362f77ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/nl/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/nl/thunderbird-78.6.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "864ac834a0f44ce112deb107abce170802abaa63556f0aad88ee828bf3f8a98c"; + sha256 = "8f006195886d26a519363c1a61940a53388952a67bae4fad07de50ab24ee21c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/nn-NO/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/nn-NO/thunderbird-78.6.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "e821eaf0388885e3b5e88001a2c4410cdf065059b79a3581c324f53d1cf59eb5"; + sha256 = "85710ff8542c6d592a939a55300040633f5b8fa8587f5c6c0ba0c3c2c7e5e62e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/pa-IN/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pa-IN/thunderbird-78.6.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "5a0afbf815683afd24c258ac66a45dc300028b4d41a9950784355645874459ed"; + sha256 = "cc1120713915ba43b74e9a4daa5814cf83b32317bc1503061c233e5fe28f8214"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/pl/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pl/thunderbird-78.6.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "cebdc0a0188edc63fce0b4fe0a4a3f22ab792ad486bd1e10e635ac8f641f1b5d"; + sha256 = "bf3da9722d7c9602304f64c7b11aba83cb899a23c1ddd179d5eb431aca23301b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/pt-BR/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pt-BR/thunderbird-78.6.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "7bbf9aa4d48bf84a7455dcebc6b7476e4c1ffa085c1771fbdf302f71d10e4825"; + sha256 = "0104d48b2de1e26e3b66545a76b7892e2b1b17f56ebf8558353e031fb8741614"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/pt-PT/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pt-PT/thunderbird-78.6.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b84c28dfb5d677768a6e0f69c8ea63fcaf884839739789ac72f50e7b8884f8ca"; + sha256 = "b376bc3cc3f87484c9f976f30a3049bd4873ec67982574ec570c5c96d7643285"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/rm/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/rm/thunderbird-78.6.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "f34eea430a9e929c25ad961b1c92724c5539a46cbbfb9a97a5c7edca4996115a"; + sha256 = "d68e60b06b03b5313a1ddc42464ee5a3ead106655860e1d2c359802875276778"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ro/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ro/thunderbird-78.6.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "115cd666282822f35924d4de3b33fd0dd3d790d278bb35849ada579d43d5ac54"; + sha256 = "051c01b3e2f69258e1d44599c6c485785c1624a67fa6548517ec242c69bf47fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ru/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ru/thunderbird-78.6.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "961eb62e639f8f7c7c5695bd39df50fe4b3401e7aeade8281600779bb8edd374"; + sha256 = "db0f48c765e7ec9c090e1d5f43f42faa5ac6cc9e4d593dbc6b8ff6f8f7210027"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/si/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/si/thunderbird-78.6.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "0887999609e47839a0f7600215c3083ce939fe13abc0c38cf701449224dbc87a"; + sha256 = "fc104d206779b8b909f645a86151b193da0792c9af6360fbb4933d8224f23bb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/sk/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sk/thunderbird-78.6.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a3b9281efc4c0cd6cb454f2c5b97567b4d2c6567076cee188e85c30a45213f98"; + sha256 = "d08d8fe02577ad931020fdfd45b673fd2b71e41d66c1532b8025012e493c869d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/sl/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sl/thunderbird-78.6.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "141e9a41dba4c2a3eee4370d2db6e14f8805fee2d70c20ecbb9865b7a0dcaa77"; + sha256 = "6907401bb3973911ece57b9b3bd56032b02c2c140ab79ec554f4574a7e2121cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/sq/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sq/thunderbird-78.6.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "6a50fdac7993294937756a169b4b0ac7fe021611c5c6a730ea194ee7302c95dc"; + sha256 = "bca13f569b5cd0e6a4bac8ae59a8f1b228010a95871763600080473f45ffe5a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/sr/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sr/thunderbird-78.6.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "2ec4c2f367bceb3f05c75e55366cc66fae6593fc35c79d7bea57f34f93d79dba"; + sha256 = "df9328979af4c36d553992e0928d63a6cfcf0a54541e091fe7bb57e2e934057f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/sv-SE/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sv-SE/thunderbird-78.6.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "4a9027f9aa74bd9c6e3cbf02ac1918f1b9dfbda57ed0344a99fccad9fa271f79"; + sha256 = "a310b66e76a2062354d2ec10dbe0827188610618ac87f866010b418d26032a50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/th/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/th/thunderbird-78.6.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "f394b18a364fa84ff5eeeee00c841248ba4095285833ce625b700fd500b9c0cc"; + sha256 = "efb37f15a311d2c66678f42f13085e77eaf8819b2fe16ee52e3410dde5e85bee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/tr/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/tr/thunderbird-78.6.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "9f180c1b6b604fc597bf1ecb10e3521c70953cb70d4292105cb3bc7cbeb806c0"; + sha256 = "4f9f9088ab91ebc3e4e022ba77cf8c168ab961c73317fccd07e987e38ec6eb57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/uk/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/uk/thunderbird-78.6.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "f828ac8f52bda71f913462e60fb7ea2221de4f824063b95b85709320a820db8a"; + sha256 = "d9c527045270007c74e84d9f77ab6cbab2f07112d8688757920f5adbc5bbdf1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/uz/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/uz/thunderbird-78.6.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "8d3dd4a1bbe008e4d346c22c01bafe988dde88fa6c9919c50194b9b155bc821f"; + sha256 = "9ea90845e8668afff622f412f571b59e03e6c02d49a4e47cb99ab93f5da822dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/vi/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/vi/thunderbird-78.6.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "4db40b3debca281c59e926bd0f9cb4e5cd2150bf27235f1178ed8e497616a031"; + sha256 = "ccf4bd8c6269fb8ae15413923d556ecafb808ef205688dfb78379347a5bce5f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/zh-CN/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/zh-CN/thunderbird-78.6.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "399707f970a01e2f3c2eacc81f2f3bb33b1f49433c3ba6c49f4615b499f0c246"; + sha256 = "22f0b4a72f995a9936fed178138d3e0c40fb3aefeda989c9ba83fc82a4296fcf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/zh-TW/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/zh-TW/thunderbird-78.6.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "27ad21908069582a4a7641dc9a7d9acc69d4842382499cef2cee2f84d0fc3856"; + sha256 = "b8c8633732641b8ab87bfc2a2867a95b817ce6d0fd0e8f569221bc51ac23e849"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index e5d9d8932f235..66d2667e7ed0d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -14,13 +14,15 @@ , freetype , glib , gnugrep +, gnupg , gnused +, gpgme , icu , jemalloc , lib +, libevent , libGL , libGLU -, libevent , libjpeg , libnotify , libpng @@ -71,13 +73,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.5.1"; + version = "78.6.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "202s2h9fsvg4chy93rgxdf4vlavf3wbp9vqgh0nrgk5wcdhz17144vhw1bmxia8hf99snq2a3ix6haidwl8d2n6l2nfsjzcnphhxd9z"; + "0hx9gg3ngpvgshrz9j7ni4kh3chadqd5w5fpywjjw4naj0k53d0i9jjhq4p6fyvf6rb2g825ibqq794lr9drn6nrfndh5w1yn5lw69n"; }; nativeBuildInputs = [ @@ -289,6 +291,15 @@ stdenv.mkDerivation rec { install -Dm 444 $out/lib/thunderbird/chrome/icons/default/default256.png $out/share/icons/hicolor/256x256/apps/thunderbird.png ''; + # Note on GPG support: + # Thunderbird's native GPG support does not yet support smartcards. + # The official upstream recommendation is to configure fall back to gnupg + # using the Thunderbird config `mail.openpgp.allow_external_gnupg` + # and GPG keys set up; instructions with pictures at: + # https://anweshadas.in/how-to-use-yubikey-or-any-gpg-smartcard-in-thunderbird-78/ + # For that to work out of the box, it requires `gnupg` on PATH and + # `gpgme` in `LD_LIBRARY_PATH`; we do this below. + preFixup = '' # Needed to find Mozilla runtime gappsWrapperArgs+=( @@ -298,6 +309,8 @@ stdenv.mkDerivation rec { --set SNAP_NAME "thunderbird" --set MOZ_LEGACY_PROFILES 1 --set MOZ_ALLOW_DOWNGRADE 1 + --prefix PATH : "${lib.getBin gnupg}/bin" + --prefix LD_LIBRARY_PATH : "${lib.getLib gpgme}/lib" ) ''; @@ -326,7 +339,7 @@ stdenv.mkDerivation rec { requiredSystemFeatures = [ "big-parallel" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A full-featured e-mail client"; homepage = "https://www.thunderbird.net"; maintainers = with maintainers; [ diff --git a/pkgs/applications/networking/openbazaar/client.nix b/pkgs/applications/networking/openbazaar/client.nix index c890329771fe4..1d055520d1f6c 100644 --- a/pkgs/applications/networking/openbazaar/client.nix +++ b/pkgs/applications/networking/openbazaar/client.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "openbazaar-client"; - version = "2.4.8"; + version = "2.4.9"; src = fetchurl { url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb"; - sha256 = "0c8ar0rd4yydy4rd4hqafljrhi40v3cwhc9v7fjbrfhcx1ikmf64"; + sha256 = "1l6l72kb5h5f32dl5wqv31sigl3fh2byixv0h0d3icmjf558c39p"; }; dontBuild = true; diff --git a/pkgs/applications/networking/p2p/deluge/1/default.nix b/pkgs/applications/networking/p2p/deluge/1.nix index 7ab3379241550..aa70f969d221a 100644 --- a/pkgs/applications/networking/p2p/deluge/1/default.nix +++ b/pkgs/applications/networking/p2p/deluge/1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }: +{ stdenv, fetchurl, fetchpatch, intltool, libtorrent-rasterbar, pythonPackages }: pythonPackages.buildPythonPackage rec { pname = "deluge"; @@ -19,7 +19,7 @@ pythonPackages.buildPythonPackage rec { propagatedBuildInputs = with pythonPackages; [ pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity - libtorrentRasterbar.dev libtorrentRasterbar.python setuptools + libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools ]; nativeBuildInputs = [ intltool ]; diff --git a/pkgs/applications/networking/p2p/deluge/2/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 2e9f08ce98a87..f9c421c408735 100644 --- a/pkgs/applications/networking/p2p/deluge/2/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages +{ stdenv, fetchurl, intltool, libtorrent-rasterbar, pythonPackages , gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }: pythonPackages.buildPythonPackage rec { @@ -12,7 +12,7 @@ pythonPackages.buildPythonPackage rec { propagatedBuildInputs = with pythonPackages; [ twisted Mako chardet pyxdg pyopenssl service-identity - libtorrentRasterbar.dev libtorrentRasterbar.python setuptools + libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools setproctitle pillow rencode six zope_interface dbus-python pygobject3 pycairo gtk3 gobject-introspection librsvg diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 364aeac550e62..8ef8740f4d2ac 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.8.8"; + version = "6.8.9"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "0zxk0nv7m1k4n8n82h1rkh239a58s7j643lgqbw3qx45bdy4sf4k"; + sha256 = "0f5vyliwncryj6hj5xx0dycxycxddsn28n6zixjrn56jajijyl6q"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 9b6a8bd707d54..2e69ad23e14c5 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,29 +1,32 @@ -{ mkDerivation, lib, fetchFromGitHub, pkgconfig -, boost, libtorrentRasterbar, qtbase, qttools, qtsvg -, debugSupport ? false # Debugging +{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkgconfig +, boost, libtorrent-rasterbar, qtbase, qttools, qtsvg +, debugSupport ? false , guiSupport ? true, dbus ? null # GUI (disable to run headless) , webuiSupport ? true # WebUI +, trackerSearch ? true, python3 ? null }: assert guiSupport -> (dbus != null); -with lib; +assert trackerSearch -> (python3 != null); +with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.3.0.1"; + version = "4.3.1"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "068sf24mjvc2idimgpzvf7gjk8n9xrr3qqlqfx5j3j598ckm3yfp"; + sha256 = "17ih00q7idrpl3b2vgh4smva6lazs5jw06pblriscn1lrwdvrc38"; }; # NOTE: 2018-05-31: CMake is working but it is not officially supported - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; - buildInputs = [ boost libtorrentRasterbar qtbase qttools qtsvg ] - ++ optional guiSupport dbus; # D(esktop)-Bus depends on GUI support + buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ] + ++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support + ++ optional trackerSearch python3; # Otherwise qm_gen.pri assumes lrelease-qt5, which does not exist. QMAKE_LRELEASE = "lrelease"; @@ -35,6 +38,12 @@ mkDerivation rec { ++ optional (!webuiSupport) "--disable-webui" ++ optional debugSupport "--enable-debug"; + postInstall = "wrapProgram $out/bin/${ + if guiSupport + then "qbittorrent" + else "qbittorrent-nox" + } --prefix PATH : ${makeBinPath [ python3 ]}"; + enableParallelBuilding = true; meta = { diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 5cab23ecd710c..d30697a4df003 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; pythonPath = [ - python3Packages.libtorrentRasterbar + python3Packages.libtorrent-rasterbar python3Packages.twisted python3Packages.netifaces python3Packages.pycrypto diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index d906b4459009d..66292e20c525d 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with stdenv.lib; let - version = "3.4.0"; + version = "3.4.2"; variant = if withQt then "qt" else "cli"; pcap = libpcap.override { withBluez = stdenv.isLinux; }; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "1bm8jj2rviis9j9l6nixvhxcfx362y9iphkxssgmiz2kj6yypr37"; + sha256 = "1i548w6zv6ni5n22rs90a12aakyq811493dxmadlcsj2krr6i66y"; }; cmakeFlags = [ @@ -80,9 +80,6 @@ in stdenv.mkDerivation { '' else optionalString withQt '' install -Dm644 -t $out/share/applications ../wireshark.desktop - substituteInPlace $out/share/applications/*.desktop \ - --replace "Exec=wireshark" "Exec=$out/bin/wireshark" - install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index be255a6c1465f..b41178922af98 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.2"; + version = "2.4.7"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - sha256 = "10s33p1xzq9c5n1bxv9n7n31afxgx9i6c17w0xgxdrma75micm3a"; + sha256 = "12g2z6c4f65y8cc7vyhk9nlg1mpbsmlsj7ghlny452qhr13m7qpn"; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkgconfig ]; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index da4551d7f5552..e93b6f9a432a5 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "syncplay"; - version = "1.6.6"; + version = "1.6.7"; format = "other"; @@ -10,7 +10,7 @@ buildPythonApplication rec { owner = "Syncplay"; repo = "syncplay"; rev = "v${version}"; - sha256 = "1wkxdp7dv5y1100awy949higvs5035ylfyl83qrp4lnimy3imw09"; + sha256 = "1hxmd13sff51lh9l3vpk33qrzf7gi58c76bc01iqimp17sxwfz3k"; }; propagatedBuildInputs = [ pyside2 shiboken2 twisted certifi ] ++ twisted.extras.tls; diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index e26081a02980f..d956a3b08a615 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -469,11 +469,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2020-04-01.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-04-01.tar.bz2"; - sha256 = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da"; + name = "language-subtag-registry-2020-09-29.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-09-29.tar.bz2"; + sha256 = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f"; md5 = ""; - md5name = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da-language-subtag-registry-2020-04-01.tar.bz2"; + md5name = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f-language-subtag-registry-2020-09-29.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -700,11 +700,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-4137.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-4137.tar.bz2"; - sha256 = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6"; + name = "pdfium-4306.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-4306.tar.bz2"; + sha256 = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8"; md5 = ""; - md5name = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6-pdfium-4137.tar.bz2"; + md5name = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8-pdfium-4306.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index dbfd249901e70..c9b1826471145 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,8 +8,8 @@ rec { major = "7"; minor = "0"; - patch = "3"; - tweak = "1"; + patch = "4"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0b998k2dxbbj7hn3srn07fgsah236h14ncyyahamdff6h3hvqrk5"; + sha256 = "1g9akxvm7fh6lnprnc3g184qdy8gbinhb4rb60gjpw82ip6d5acz"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "0s3ic79q0c16hbd6r06mwkyqhw4fdfy9z3xbqvdxp7jl64cjlaj4"; + sha256 = "1v3kpk56fm783d5wihx41jqidpclizkfxrg4n0pq95d79hdiljsl"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "14wjkcdmcflfcc7264jx64s6clk5rdsprx7nkbv08z0bp6ff677b"; + sha256 = "1np9f799ww12kggl5az6piv5fi9rf737il5a5r47r4wl2li56qqb"; }; } diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index e3b9408ed96db..843e7ec0145eb 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -1,6 +1,7 @@ { mkDerivation , lib , fetchurl +, fetchpatch , extra-cmake-modules , qtbase , boost @@ -24,6 +25,15 @@ mkDerivation rec { sha256 = "0b316ddcd46sawva84x5d8nsp19v66gbm83djrra7fv3k8nkv4xh"; }; + patches = [ + # Build with kontactinterface >= 5.14.42. + # Remove after next release. + (fetchpatch { + url = "https://invent.kde.org/pim/zanshin/-/commit/4850c08998b33b37af99c3312d193b063b3e8174.diff"; + sha256 = "sha256:0lh0a035alhmws3zyfnkb814drq5cqxvzpwl4g1g5d435gy8k4ps"; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules ]; @@ -48,6 +58,5 @@ mkDerivation rec { maintainers = with maintainers; [ zraexy ]; platforms = platforms.linux; license = licenses.gpl2Plus; - broken = true; }; } diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix new file mode 100644 index 0000000000000..5cad364d240b3 --- /dev/null +++ b/pkgs/applications/printing/pappl/default.nix @@ -0,0 +1,62 @@ +{ lib, stdenv, fetchFromGitHub +, avahi +, cups +, gnutls +, libjpeg +, libpng +, libusb1 +, pkg-config +, withPAMSupport ? true, pam +, zlib +}: + +stdenv.mkDerivation rec { + pname = "pappl"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "michaelrsweet"; + repo = pname; + rev = "v${version}"; + sha256 = "1cg06v8hxska0hnybnmfda1v4h3ifjir24nx2iqx80kb6jq0hayb"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + cups + libjpeg + libpng + libusb1 + zlib + ] ++ lib.optionals (!stdenv.isDarwin) [ + # upstream mentions these are not needed for Mac + # see: https://github.com/michaelrsweet/pappl#requirements + avahi + gnutls + ] ++ lib.optionals withPAMSupport [ + pam + ]; + + # testing requires some networking + # doCheck = true; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/pappl-makeresheader --help + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "C-based framework/library for developing CUPS Printer Applications"; + homepage = "https://github.com/michaelrsweet/pappl"; + license = licenses.asl20; + platforms = platforms.linux; # should also work for darwin, but requires additional work + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index dd8c56610c287..3197a7d0cc4a0 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -26,6 +26,7 @@ qtserialport, qtwebsockets, rtl-sdr, serialdv, +soapysdr-with-plugins, uhd }: @@ -46,12 +47,13 @@ mkDerivation rec { glew opencv3 libusb1 boost libopus limesuite libav libiio libpulseaudio qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf fftwFloat codec2 cm256cc serialdv qtserialport - libbladeRF uhd + libbladeRF uhd soapysdr-with-plugins ]; cmakeFlags = [ "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv" "-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include" "-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite.so" + "-DSOAPYSDR_DIR=${soapysdr-with-plugins}" ]; LD_LIBRARY_PATH = "${ocl-icd}/lib"; diff --git a/pkgs/applications/radio/soapyaudio/default.nix b/pkgs/applications/radio/soapyaudio/default.nix new file mode 100644 index 0000000000000..ce5811b009ee7 --- /dev/null +++ b/pkgs/applications/radio/soapyaudio/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config +, hamlib, rtaudio, alsaLib, libpulseaudio, libjack2, libusb1, soapysdr +} : + +stdenv.mkDerivation rec { + pname = "soapyaudio"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyAudio"; + rev = "soapy-audio-${version}"; + sha256 = "0minlsc1lvmqm20vn5hb4im7pz8qwklfy7sbr2xr73xkrbqdahc0"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ hamlib rtaudio alsaLib libpulseaudio libjack2 libusb1 soapysdr ]; + + cmakeFlags = [ + "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" + "-DUSE_HAMLIB=ON" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/pothosware/SoapyAudio"; + description = "SoapySDR plugin for amateur radio and audio devices"; + license = licenses.mit; + maintainers = with maintainers; [ numinit ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix index a169116c29a1b..b2223d1abb70d 100644 --- a/pkgs/applications/radio/soapyuhd/default.nix +++ b/pkgs/applications/radio/soapyuhd/default.nix @@ -1,22 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkg-config , uhd, boost, soapysdr } : -let - version = "0.3.6"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "soapyuhd"; - inherit version; + version = "0.4.1"; src = fetchFromGitHub { owner = "pothosware"; repo = "SoapyUHD"; rev = "soapy-uhd-${version}"; - sha256 = "11kp5iv21k8lqwjjydzqmcxdgpm6yicw6d3jhzvcvwcavd41crs7"; + sha256 = "14rk9ap9ayks2ma6mygca08yfds9bgfmip8cvwl87l06hwhnlwhj"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ uhd boost soapysdr ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; @@ -28,7 +25,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/pothosware/SoapyAirspy"; description = "SoapySDR plugin for UHD devices"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ markuskowa ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index fde8df6104854..c32d671cb05df 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -1,46 +1,51 @@ { - stdenv, extra-cmake-modules, fetchurl, + lib, mkDerivation, extra-cmake-modules, fetchurl, kconfig, kdoctools, kguiaddons, ki18n, kinit, kiconthemes, kio, - knewstuff, kplotting, kwidgetsaddons, kxmlgui, wrapQtAppsHook, + knewstuff, kplotting, kwidgetsaddons, kxmlgui, knotifyconfig, - qtx11extras, qtwebsockets, + + qtx11extras, qtwebsockets, qtkeychain, libsecret, eigen, zlib, - cfitsio, indilib, xplanet, libnova, gsl + cfitsio, indilib, xplanet, libnova, libraw, gsl, wcslib, stellarsolver }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "kstars"; - version = "3.4.3"; + version = "3.5.0"; src = fetchurl { - url = "https://mirrors.mit.edu/kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "0j5yxg6ay6sic194skz6vjzg6yvrpb3gvypvs0frjrcjbsl1j4f8"; + url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; + sha256 = "0fpkm75abn0hhdhfyvpfl6n0fr7gvw63xhb4hvwdrglhkf2nxam1"; }; patches = [ - ./indi-fix.patch + # Patches ksutils.cpp to use nix store prefixes to find program binaries of + # indilib and xplanet dependencies. Without the patch, Ekos is unable to spawn + # indi servers for local telescope/camera control. + ./fs-fixes.patch ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kdoctools kguiaddons ki18n kinit kiconthemes kio - knewstuff kplotting kwidgetsaddons kxmlgui + knewstuff kplotting kwidgetsaddons kxmlgui knotifyconfig - qtx11extras qtwebsockets + qtx11extras qtwebsockets qtkeychain libsecret eigen zlib - cfitsio indilib xplanet libnova gsl + cfitsio indilib xplanet libnova libraw gsl wcslib stellarsolver ]; cmakeFlags = [ "-DINDI_NIX_ROOT=${indilib}" + "-DXPLANET_NIX_ROOT=${xplanet}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Virtual planetarium astronomy software"; homepage = "https://kde.org/applications/education/org.kde.kstars"; longDescription = '' @@ -50,6 +55,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ timput ]; + maintainers = with maintainers; [ timput hjones2199 ]; }; } diff --git a/pkgs/applications/science/astronomy/kstars/fs-fixes.patch b/pkgs/applications/science/astronomy/kstars/fs-fixes.patch new file mode 100644 index 0000000000000..b9bdfc0c5dea0 --- /dev/null +++ b/pkgs/applications/science/astronomy/kstars/fs-fixes.patch @@ -0,0 +1,59 @@ +--- kstars-3.5.0/CMakeLists.txt.old 2020-11-24 12:36:37.967433937 -0600 ++++ kstars-3.5.0/CMakeLists.txt 2020-11-24 13:36:56.275263691 -0600 +@@ -5,6 +5,9 @@ + set (KSTARS_BUILD_RELEASE "Stable") + set (CMAKE_CXX_STANDARD 11) + ++add_definitions(-DINDI_NIX_ROOT=${INDI_NIX_ROOT}) ++add_definitions(-DXPLANET_NIX_ROOT=${XPLANET_NIX_ROOT}) ++ + # Build KStars Lite with -DBUILD_KSTARS_LITE=ON + option(BUILD_KSTARS_LITE "Build KStars Lite" OFF) + +--- kstars-3.5.0/kstars/auxiliary/ksutils.old.cpp 2020-11-24 12:22:14.397319680 -0600 ++++ kstars-3.5.0/kstars/auxiliary/ksutils.cpp 2020-11-24 13:32:22.946477798 -0600 +@@ -1081,6 +1081,10 @@ + // We support running within Snaps, Flatpaks, and AppImage + // The path should accomodate the differences between the different + // packaging solutions ++ #define STR_EXPAND(x) #x ++ #define STR(x) STR_EXPAND(x) ++ QString indi_prefix = QString(STR(INDI_NIX_ROOT)); ++ QString xplanet_prefix = QString(STR(XPLANET_NIX_ROOT)); + QString snap = QProcessEnvironment::systemEnvironment().value("SNAP"); + QString flat = QProcessEnvironment::systemEnvironment().value("FLATPAK_DEST"); + QString appimg = QProcessEnvironment::systemEnvironment().value("APPDIR"); +@@ -1110,21 +1114,21 @@ + #if defined(Q_OS_OSX) + return "/usr/local/bin/indiserver"; + #endif +- return prefix + "/bin/indiserver"; ++ return indi_prefix + "/bin/indiserver"; + } + else if (option == "INDIHubAgent") + { + #if defined(Q_OS_OSX) + return "/usr/local/bin/indihub-agent"; + #endif +- return prefix + "/bin/indihub-agent"; ++ return indi_prefix + "/bin/indihub-agent"; + } + else if (option == "indiDriversDir") + { + #if defined(Q_OS_OSX) + return "/usr/local/share/indi"; + #elif defined(Q_OS_LINUX) +- return prefix + "/share/indi"; ++ return indi_prefix + "/share/indi"; + #else + return QStandardPaths::locate(QStandardPaths::GenericDataLocation, "indi", QStandardPaths::LocateDirectory); + #endif +@@ -1181,7 +1185,7 @@ + #if defined(Q_OS_OSX) + return "/usr/local/bin/xplanet"; + #endif +- return prefix + "/bin/xplanet"; ++ return xplanet_prefix + "/bin/xplanet"; + } + else if (option == "ASTAP") + { diff --git a/pkgs/applications/science/astronomy/kstars/indi-fix.patch b/pkgs/applications/science/astronomy/kstars/indi-fix.patch deleted file mode 100644 index 9ff9f8a31dd3c..0000000000000 --- a/pkgs/applications/science/astronomy/kstars/indi-fix.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- CMakeLists.txt 2020-11-02 13:58:06.119743710 -0600 -+++ kstars-3.4.3/CMakeLists.txt 2020-11-02 14:05:01.707799274 -0600 -@@ -4,5 +4,7 @@ - set (KStars_VERSION_REVISION 3) - set (CMAKE_CXX_STANDARD 11) - -+add_definitions(-DINDI_NIX_ROOT=${INDI_NIX_ROOT}) -+ - # Build KStars Lite with -DBUILD_KSTARS_LITE=ON - option(BUILD_KSTARS_LITE "Build KStars Lite" OFF) - ---- ksutils.cpp 2020-11-02 13:47:44.883596916 -0600 -+++ kstars-3.4.3/kstars/auxiliary/ksutils.cpp 2020-11-02 17:41:44.961937090 -0600 -@@ -1076,6 +1076,9 @@ - { - QString snap = QProcessEnvironment::systemEnvironment().value("SNAP"); - QString flat = QProcessEnvironment::systemEnvironment().value("FLATPAK_DEST"); -+#define STR_EXPAND(x) #x -+#define STR(x) STR_EXPAND(x) -+ QString nix = QString(STR(INDI_NIX_ROOT)); - - if (option == "fitsDir") - { -@@ -1089,7 +1091,7 @@ - if (flat.isEmpty() == false) - return flat + "/bin/indiserver"; - else -- return snap + "/usr/bin/indiserver"; -+ return nix + "/bin/indiserver"; - } - else if (option == "INDIHubAgent") - { -@@ -1099,7 +1101,7 @@ - if (flat.isEmpty() == false) - return flat + "/bin/indihub-agent"; - else -- return snap + "/usr/bin/indihub-agent"; -+ return nix + "/bin/indihub-agent"; - } - else if (option == "indiDriversDir") - { -@@ -1109,7 +1111,7 @@ - if (flat.isEmpty() == false) - return flat + "/share/indi"; - else -- return snap + "/usr/share/indi"; -+ return nix + "/share/indi"; - #else - return QStandardPaths::locate(QStandardPaths::GenericDataLocation, "indi", QStandardPaths::LocateDirectory); - #endif diff --git a/pkgs/applications/science/biology/spades/default.nix b/pkgs/applications/science/biology/spades/default.nix index d555f2873a67b..776719579d979 100644 --- a/pkgs/applications/science/biology/spades/default.nix +++ b/pkgs/applications/science/biology/spades/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, bzip2, cmake }: +{ stdenv, fetchurl, zlib, bzip2, cmake, python3 }: stdenv.mkDerivation rec { pname = "SPAdes"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib bzip2 ]; + buildInputs = [ zlib bzip2 python3 ]; doCheck = true; diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index d432e66a19f1e..317a83371adbd 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -1,11 +1,9 @@ { stdenv, fetchFromGitLab, cmake, gfortran, perl -, openblas, blas, lapack, hdf5-cpp, python3, texlive +, openblas, hdf5-cpp, python3, texlive , armadillo, openmpi, globalarrays, openssh , makeWrapper, fetchpatch } : -assert blas.implementation == "openblas" && lapack.implementation == "openblas"; - let version = "20.10"; gitLabRev = "v${version}"; @@ -74,7 +72,7 @@ in stdenv.mkDerivation { homepage = "https://gitlab.com/Molcas/OpenMolcas"; maintainers = [ maintainers.markuskowa ]; license = licenses.lgpl21; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/science/geometry/gama/default.nix b/pkgs/applications/science/geometry/gama/default.nix index fe606125c5527..c5e95d37b5106 100644 --- a/pkgs/applications/science/geometry/gama/default.nix +++ b/pkgs/applications/science/geometry/gama/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, lib, expat, octave, libxml2, texinfo }: +{ stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }: stdenv.mkDerivation rec { pname = "gama"; - version = "2.09"; + version = "2.12"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0c1b28frl6109arj09v4zr1xs859krn8871mkvis517g5pb55dc9"; + sha256 = "0zfilasalsy29b7viw0iwgnl9bkvp0l87gpxl1hx7379l8agwqyj"; }; buildInputs = [ expat ]; - nativeBuildInputs = [ texinfo ]; + nativeBuildInputs = [ texinfo zip ]; checkInputs = [ octave libxml2 ]; doCheck = true; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 5c16f7defa800..2ebe75d3bc508 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -36,6 +36,7 @@ let "8.11.2" = "0f77ccyxdgbf1nrj5fa8qvrk1cyfy06fv8gj9kzfvlcgn0cf48sa"; "8.12.0" = "18dc7k0piv6v064zgdadpw6mkkxk7j663hb3svgj5236fihjr0cz"; "8.12.1" = "1rkcyjjrzcqw9xk93hsq0vvji4f8r5iq0f739mghk60bghkpnb7q"; + "8.12.2" = "18gscfm039pqhq4msq01nraig5dm9ab98bjca94zldf8jvdv0x2n"; "8.13+beta1" = "1v4a6dpj41flspa4ihcr7m5ahqz10kbn62fmrldmv7gzq6jsyfyq"; }.${version}; coq-version = stdenv.lib.versions.majorMinor version; diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index 28295ea28922c..78861786defae 100644 --- a/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/pkgs/applications/science/logic/cryptoverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cryptoverif"; - version = "2.03pl1"; + version = "2.04"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz"; - sha256 = "0q7qa1qm7mbky3m36445gdmgmkb9mrhrdsk7mmwn8fzw0rfc6z00"; + sha256 = "1mzk6n0g2vdsv38y493zg85lxrpz72b92cmsray3g970xzanqd6s"; }; buildInputs = [ ocaml ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ** from under $out/libexec. By default, it expects to find the files ** in $CWD which doesn't work. */ patchPhase = '' - substituteInPlace ./src/settings.ml \ + substituteInPlace ./src/syntax.ml \ --replace \"default\" \"$out/libexec/default\" ''; diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index 18b6e051b3f26..5df2d20549c2b 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, python3Packages, readline }: +{ stdenv, fetchFromGitHub, python3Packages, readline, bc }: with stdenv.lib; stdenv.mkDerivation rec { pname = "bcal"; - version = "1.9"; + version = "2.2"; src = fetchFromGitHub { owner = "jarun"; repo = "bcal"; rev = "v${version}"; - sha256 = "0h6qi5rvzl6c6fsfdpdb3l4jcgip03l18i0b1x08z1y89i56y8mm"; + sha256 = "4vR5rcbNkoEdSRNoMH9qMHP3iWFxejkVfXNiYfwbo/A="; }; nativeBuildInputs = [ python3Packages.pytest ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; doCheck = true; + checkInputs = [ bc ]; checkPhase = '' python3 -m pytest test.py ''; @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Storage conversion and expression calculator"; homepage = "https://github.com/jarun/bcal"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; }; diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index ea9c921f19e12..b090274919bd4 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -9,11 +9,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "giac${lib.optionalString enableGUI "-with-xcas"}"; - version = "1.5.0-21"; # TODO try to remove preCheck phase on upgrade + version = "1.5.0-87"; # TODO try to remove preCheck phase on upgrade src = fetchurl { url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz"; - sha256 = "1b9khiv0mk2xzw1rblm2jy6qsf8y6f9k7qy15sxpb21d72hzzbl2"; + sha256 = "1d0h1yb7qvh9x7wwv9yrzmcp712f49w1iljkxp4y6g9pzsmg1mmv"; }; patches = stdenv.lib.optionals (!enableGUI) [ diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix index 8ec6ac5048d55..896983ce1563d 100644 --- a/pkgs/applications/science/math/mathematica/l10ns.nix +++ b/pkgs/applications/science/math/mathematica/l10ns.nix @@ -8,22 +8,10 @@ let allVersions = with lib; flip map # N.B. Versions in this list should be ordered from newest to oldest. [ { - version = "12.1.1"; + version = "12.2.0"; lang = "en"; language = "English"; - sha256 = "02mk8gmv8idnakva1nc7r7mx8ld02lk7jgsj1zbn962aps3bhixd"; - } - { - version = "12.1.0"; - lang = "en"; - language = "English"; - sha256 = "15m9l20jvkxh5w6mbp81ys7mx2lx5j8acw5gz0il89lklclgb8z7"; - } - { - version = "12.0.0"; - lang = "en"; - language = "English"; - sha256 = "b9fb71e1afcc1d72c200196ffa434512d208fa2920e207878433f504e58ae9d7"; + sha256 = "3b6676a203c6adb7e9c418a5484b037974287b5be09c64e7dfea74ddc0e400d7"; } { version = "11.3.0"; diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 1bf7d16f29048..cdc81a8764656 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -87,6 +87,10 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; + passthru = { + ecl = ecl; + }; + meta = { description = "Computer algebra system"; homepage = "http://maxima.sourceforge.net"; diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index 76e7c796a1388..94b7ad266c454 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "27r1"; src = fetchurl { url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz"; - sha256 = "1nym0p2djws8ylkpr0kgpxfa6fxdlh46cmvz0gn5vd02jzgs0aww"; + sha256 = "0xsfqfcknbd6g6wzpa5l7crmmk3bf3zjh37rhylq6b20dqcmvjkn"; }; outputs = [ "out" "dev" ]; configureFlags = [ diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index a3e2f99ab274c..7ec42d11ab14d 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { version = "2.11.4"; src = fetchurl { - url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz"; + # Versions with current majorMinor values are at http://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz + url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; sha256 = "sha256-v8iPxPc1L0hA5uNSxy8DacvqikVAOxg0piafNwmXCxw="; }; diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index 87fb205174bfd..e3474d865e2de 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchurl , autoreconfHook , pkgconfig , flint @@ -33,6 +34,14 @@ stdenv.mkDerivation rec { pkgconfig ]; + patches = [ + (fetchurl { + name = "py_ssize_t_clean.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/py_ssize_t_clean.patch?h=9.2"; + sha256 = "0l3gbg9hc4v671zf4w376krnk3wh8hj3649610nlvzzxckcryzab"; + }) + ]; + meta = with stdenv.lib; { description = "Python is Not a CAS -- modified version of Ginac"; longDescription = '' diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index caf51c3da2517..416f2b957b7b3 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -9,31 +9,13 @@ let inherit (pkgs) symlinkJoin callPackage nodePackages; - # https://trac.sagemath.org/ticket/15980 for tracking of python3 support - python = pkgs.python2.override { + python3 = pkgs.python3.override { packageOverrides = self: super: { - # python packages that appear unmaintained and were not accepted into the nixpkgs - # tree because of that. These packages are only dependencies of the more-or-less - # deprecated sagenb. However sagenb is still a default dependency and the doctests - # depend on it. - # See https://github.com/NixOS/nixpkgs/pull/38787 for a discussion. - # The dependency on the sage notebook (and therefore these packages) will be - # removed in the future: - # https://trac.sagemath.org/ticket/25837 - flask-oldsessions = self.callPackage ./flask-oldsessions.nix {}; - flask-openid = self.callPackage ./flask-openid.nix {}; - python-openid = self.callPackage ./python-openid.nix {}; - sagenb = self.callPackage ./sagenb.nix { - mathjax = nodePackages.mathjax; - }; - - # Package with a cyclic dependency with sage - pybrial = self.callPackage ./pybrial.nix {}; - # `sagelib`, i.e. all of sage except some wrappers and runtime dependencies sagelib = self.callPackage ./sagelib.nix { - inherit flint ecl arb; + inherit flint arb; inherit sage-src env-locations pynac singular; + ecl = maxima-ecl.ecl; linbox = pkgs.linbox.override { withSage = true; }; pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig }; @@ -59,9 +41,10 @@ let # A bash script setting various environment variables to tell sage where # the files its looking fore are located. Also see `sage-env`. env-locations = callPackage ./env-locations.nix { - inherit pari_data ecl; + inherit pari_data; inherit singular maxima-ecl; - cysignals = python.pkgs.cysignals; + ecl = maxima-ecl.ecl; + cysignals = python3.pkgs.cysignals; three = nodePackages.three; mathjax = nodePackages.mathjax; }; @@ -69,21 +52,22 @@ let # The shell file that gets sourced on every sage start. Will also source # the env-locations file. sage-env = callPackage ./sage-env.nix { - sagelib = python.pkgs.sagelib; + sagelib = python3.pkgs.sagelib; inherit env-locations; - inherit python ecl singular palp flint pynac pythonEnv maxima-ecl; + inherit python3 singular palp flint pynac pythonEnv maxima-ecl; + ecl = maxima-ecl.ecl; pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig }; # The documentation for sage, building it takes a lot of ram. sagedoc = callPackage ./sagedoc.nix { inherit sage-with-env; - inherit python maxima-ecl; + inherit python3 maxima-ecl; }; # sagelib with added wrappers and a dependency on sage-tests to make sure thet tests were run. sage-with-env = callPackage ./sage-with-env.nix { - inherit pythonEnv; + inherit python3 pythonEnv; inherit sage-env; inherit pynac singular maxima-ecl; pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig @@ -100,10 +84,8 @@ let sage-src = callPackage ./sage-src.nix {}; - pythonRuntimeDeps = with python.pkgs; [ + pythonRuntimeDeps = with python3.pkgs; [ sagelib - pybrial - sagenb cvxopt networkx service-identity @@ -116,11 +98,10 @@ let ipywidgets rpy2 sphinx - typing pillow ]; - pythonEnv = python.buildEnv.override { + pythonEnv = python3.buildEnv.override { extraLibs = pythonRuntimeDeps; ignoreCollisions = true; } // { extraLibs = pythonRuntimeDeps; }; # make the libs accessible @@ -129,8 +110,21 @@ let singular = pkgs.singular.override { inherit flint; }; - # https://trac.sagemath.org/ticket/26625 - maxima-ecl = pkgs.maxima-ecl; + maxima-ecl = pkgs.maxima-ecl.override { + ecl = pkgs.ecl.override { + # "echo syntax error | ecl > /dev/full 2>&1" segfaults in + # ECL. We apply a patch to fix it (write_error.patch), but it + # only works if threads are disabled. sage 9.2 tests this + # (src/sage/interfaces/tests.py) and ships ecl like so. + # https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/1#note_1657275 + threadSupport = false; + + # if we don't use the system boehmgc, sending a SIGINT to ecl + # can segfault if we it happens during memory allocation. + # src/sage/libs/ecl.pyx would intermittently fail in this case. + useBoehmgc = true; + }; + }; # *not* to confuse with the python package "pynac" pynac = pkgs.pynac.override { inherit singular flint; }; @@ -161,9 +155,6 @@ let pari-seadata-small ]; }; - - # https://trac.sagemath.org/ticket/22191 - ecl = pkgs.ecl_16_1_2; in # A wrapper around sage that makes sure sage finds its docs (if they were build). callPackage ./sage.nix { diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix index bda2d23b9e52b..b1ad0aad9c761 100644 --- a/pkgs/applications/science/math/sage/env-locations.nix +++ b/pkgs/applications/science/math/sage/env-locations.nix @@ -44,6 +44,6 @@ writeTextFile rec { export JSMOL_DIR="${jmol}/share/jsmol" export MATHJAX_DIR="${mathjax}/lib/node_modules/mathjax" export THREEJS_DIR="${three}/lib/node_modules/three" - export SAGE_INCLUDE_DIRECTORIES="${cysignals}/lib/python2.7/site-packages" + export SAGE_INCLUDE_DIRECTORIES="${cysignals}/${cysignals.pythonModule.sitePackages}" ''; } diff --git a/pkgs/applications/science/math/sage/flask-oldsessions.nix b/pkgs/applications/science/math/sage/flask-oldsessions.nix deleted file mode 100644 index 86fe9912c19eb..0000000000000 --- a/pkgs/applications/science/math/sage/flask-oldsessions.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -, python -, flask -}: - -buildPythonPackage rec { - pname = "Flask-OldSessions"; - version = "0.10"; - - # no artifact on pypi: https://github.com/mitsuhiko/flask-oldsessions/issues/1 - src = fetchFromGitHub { - owner = "mitsuhiko"; - repo = "flask-oldsessions"; - rev = version; - sha256 = "04b5m8njjiwld9a0zw55iqwvyjgwcpdbhz1cic8nyhgcmypbicqn"; - }; - - propagatedBuildInputs = [ - flask - ]; - - # missing module flask.testsuite, probably assumes an old version of flask - doCheck = false; - checkPhase = '' - ${python.interpreter} run-tests.py - ''; - - meta = with stdenv.lib; { - description = "Provides a session class that works like the one in Flask before 0.10."; - license = licenses.bsd2; - maintainers = teams.sage.members; - homepage = "https://github.com/mitsuhiko/flask-oldsessions"; - }; -} diff --git a/pkgs/applications/science/math/sage/flask-openid.nix b/pkgs/applications/science/math/sage/flask-openid.nix deleted file mode 100644 index 900b033429ef4..0000000000000 --- a/pkgs/applications/science/math/sage/flask-openid.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, flask -, python-openid -}: - -buildPythonPackage rec { - pname = "Flask-OpenID"; - version = "1.2.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "1aycwmwi7ilcaa5ab8hm0bp6323zl8z25q9ha0gwrl8aihfgx3ss"; - }; - - propagatedBuildInputs = [ - flask - python-openid - ]; - - meta = with stdenv.lib; { - description = "Adds openid support to flask applications"; - license = licenses.bsd2; - maintainers = teams.sage.members; - homepage = "https://pythonhosted.org/Flask-OpenID/"; - }; -} diff --git a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch b/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch index 8cd80281d0e43..d5c19a54fd96d 100644 --- a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch +++ b/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch @@ -1,17 +1,17 @@ -From 8218bd4fdeb4c92de8af0d3aabec55980fc4fb3d Mon Sep 17 00:00:00 2001 +From f5ea42a7aaed7611fb55b65897b9fcf2b7bcf97e Mon Sep 17 00:00:00 2001 From: Timo Kaufmann <timokau@zoho.com> Date: Sun, 21 Oct 2018 17:52:40 +0200 Subject: [PATCH] Only test py2/py3 optional tests when all of sage is tested --- - src/sage/doctest/control.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) + src/sage/doctest/control.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py -index bf18df8b2b..935c67abf7 100644 +index 2d93841e50..6d156e29a1 100644 --- a/src/sage/doctest/control.py +++ b/src/sage/doctest/control.py -@@ -362,7 +362,8 @@ class DocTestController(SageObject): +@@ -375,7 +375,8 @@ class DocTestController(SageObject): if not optionaltag_regex.search(o): raise ValueError('invalid optional tag {!r}'.format(o)) @@ -21,15 +21,6 @@ index bf18df8b2b..935c67abf7 100644 self.options = options -@@ -765,7 +766,7 @@ class DocTestController(SageObject): - sage: DC = DocTestController(DD, [dirname]) - sage: DC.expand_files_into_sources() - sage: sorted(DC.sources[0].options.optional) # abs tol 1 -- ['guava', 'magma', 'py2'] -+ ['guava', 'magma'] - - We check that files are skipped appropriately:: - -- -2.18.1 +2.28.0 diff --git a/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch b/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch index 3f844e1b1ef59..9817592023866 100644 --- a/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch +++ b/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch @@ -1,17 +1,17 @@ diff --git a/src/sage/env.py b/src/sage/env.py -index 061b94f3f1..67cd091540 100644 +index 1ddfc7cfb9..45033d6328 100644 --- a/src/sage/env.py +++ b/src/sage/env.py -@@ -189,88 +189,13 @@ var('MAXIMA_FAS') +@@ -203,97 +203,13 @@ var('ARB_LIBRARY', 'arb') var('SAGE_BANNER', '') var('SAGE_IMPORTALL', 'yes') - -def _get_shared_lib_filename(libname, *additional_libnames): - """ -- Return the full path to a shared library file installed in the standard -- location for the system within the ``LIBDIR`` prefix (or -- ``$SAGE_LOCAL/lib`` in the case of manual build of Sage). +- Return the full path to a shared library file installed in +- ``$SAGE_LOCAL/lib`` or the directories associated with the +- Python sysconfig. - - This can also be passed more than one library name (e.g. for cases where - some library may have multiple names depending on the platform) in which @@ -25,7 +25,7 @@ index 061b94f3f1..67cd091540 100644 - For distributions like Debian that use a multiarch layout, we also try the - multiarch lib paths (i.e. ``/usr/lib/<arch>/``). - -- Returns ``None`` if the file does not exist. +- This returns ``None`` if the file does not exist. - - EXAMPLES:: - @@ -48,11 +48,17 @@ index 061b94f3f1..67cd091540 100644 - - for libname in (libname,) + additional_libnames: - if sys.platform == 'cygwin': -- bindir = sysconfig.get_config_var('BINDIR') +- # Later down we take the last matching DLL found, so search +- # SAGE_LOCAL second so that it takes precedence +- bindirs = [ +- sysconfig.get_config_var('BINDIR'), +- os.path.join(SAGE_LOCAL, 'bin') +- ] - pats = ['cyg{}.dll'.format(libname), 'cyg{}-*.dll'.format(libname)] - filenames = [] -- for pat in pats: -- filenames += glob.glob(os.path.join(bindir, pat)) +- for bindir in bindirs: +- for pat in pats: +- filenames += glob.glob(os.path.join(bindir, pat)) - - # Note: This is not very robust, since if there are multi DLL - # versions for the same library this just selects one more or less @@ -66,10 +72,13 @@ index 061b94f3f1..67cd091540 100644 - else: - ext = 'so' - -- libdirs = [sysconfig.get_config_var('LIBDIR')] +- libdirs = [ +- os.path.join(SAGE_LOCAL, 'lib'), +- sysconfig.get_config_var('LIBDIR') +- ] - multilib = sysconfig.get_config_var('MULTILIB') - if multilib: -- libdirs.insert(0, os.path.join(libdirs[0], multilib)) +- libdirs.insert(1, os.path.join(libdirs[0], multilib)) - - for libdir in libdirs: - basename = 'lib{}.{}'.format(libname, ext) @@ -89,7 +98,7 @@ index 061b94f3f1..67cd091540 100644 # locate libgap shared object -GAP_SO= _get_shared_lib_filename('gap','') -+GAP_SO= '/default' ++GAP_SO = '/default' var('GAP_SO', GAP_SO) # post process diff --git a/pkgs/applications/science/math/sage/patches/docutils-0.15.patch b/pkgs/applications/science/math/sage/patches/docutils-0.15.patch deleted file mode 100644 index 63f5d2e146dd4..0000000000000 --- a/pkgs/applications/science/math/sage/patches/docutils-0.15.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/sage/misc/sphinxify.py b/src/sage/misc/sphinxify.py -index 4849c2bffa..76b7bc8602 100644 ---- a/src/sage/misc/sphinxify.py -+++ b/src/sage/misc/sphinxify.py -@@ -25,6 +25,7 @@ from __future__ import absolute_import, print_function - import os - import re - import shutil -+import warnings - from tempfile import mkdtemp - from sphinx.application import Sphinx - -@@ -120,7 +121,10 @@ smart_quotes = no""") - # buildername, confoverrides, status, warning, freshenv). - sphinx_app = Sphinx(srcdir, confdir, outdir, doctreedir, format, - confoverrides, None, None, True) -- sphinx_app.build(None, [rst_name]) -+ with warnings.catch_warnings(): -+ # Quick and dirty workaround for https://trac.sagemath.org/ticket/28856#comment:19 -+ warnings.simplefilter("ignore") -+ sphinx_app.build(None, [rst_name]) - sys.path = old_sys_path - - # We need to remove "_" from __builtin__ that the gettext module installs diff --git a/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch b/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch index 11ca74819615b..a91ee319b8f0b 100644 --- a/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch +++ b/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch @@ -1,24 +1,24 @@ diff --git a/src/sage/tests/cmdline.py b/src/sage/tests/cmdline.py -index bd6b76ab82..ccf1203dec 100644 +index 6e034dcb5a..8ec60ec72b 100644 --- a/src/sage/tests/cmdline.py +++ b/src/sage/tests/cmdline.py -@@ -837,8 +837,6 @@ def test_executable(args, input="", timeout=100.0, **kwds): +@@ -660,8 +660,8 @@ def test_executable(args, input="", timeout=100.0, pydebug_ignore_warnings=False + sage: with open(input, 'w') as F: + ....: _ = F.write(s) + sage: L = ["sage", "--rst2ipynb", input, output] +- sage: test_executable(L) # optional - rst2ipynb +- ('', '', 0) ++ sage: test_executable(L)[2] # optional - rst2ipynb ++ 0 + sage: import json # optional - rst2ipynb + sage: d = json.load(open(output,'r')) # optional - rst2ipynb + sage: type(d) # optional - rst2ipynb +@@ -757,8 +757,6 @@ def test_executable(args, input="", timeout=100.0, pydebug_ignore_warnings=False /// 4 }}} -- sage: err # py2 +- sage: err # py2 # optional -- sagenb - '' - sage: ret + sage: ret # py2 # optional -- sagenb 0 -@@ -871,8 +869,8 @@ def test_executable(args, input="", timeout=100.0, **kwds): - sage: output = tmp_filename(ext='.sws') - sage: with open(input, 'w') as F: - ....: _ = F.write(s) -- sage: test_executable(["sage", "--rst2sws", input, output]) # py2 -- ('', '', 0) -+ sage: test_executable(["sage", "--rst2sws", input, output])[2] # py2 -+ 0 - sage: import tarfile # py2 - sage: f = tarfile.open(output, 'r') # py2 - sage: print(f.extractfile('sage_worksheet/worksheet.html').read()) # py2 diff --git a/pkgs/applications/science/math/sage/patches/ignore-werkzeug-immutable-dict-deprecation.patch b/pkgs/applications/science/math/sage/patches/ignore-werkzeug-immutable-dict-deprecation.patch deleted file mode 100644 index c5f95b498d536..0000000000000 --- a/pkgs/applications/science/math/sage/patches/ignore-werkzeug-immutable-dict-deprecation.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/sage/all.py b/src/sage/all.py -index c87c9372e9..862fca4fcc 100644 ---- a/src/sage/all.py -+++ b/src/sage/all.py -@@ -306,6 +306,7 @@ warnings.filters.remove(('ignore', None, DeprecationWarning, None, 0)) - # Ignore all deprecations from IPython etc. - warnings.filterwarnings('ignore', category=DeprecationWarning, - module='.*(IPython|ipykernel|jupyter_client|jupyter_core|nbformat|notebook|ipywidgets|storemagic)') -+warnings.filterwarnings('ignore', category=DeprecationWarning, message=r".*The import 'werkzeug.ImmutableDict' is deprecated") - # Ignore collections.abc warnings, there are a lot of them but they are - # harmless. - warnings.filterwarnings('ignore', category=DeprecationWarning, diff --git a/pkgs/applications/science/math/sage/patches/pari-stackwarn.patch b/pkgs/applications/science/math/sage/patches/pari-stackwarn.patch deleted file mode 100644 index 49cdfd189b92a..0000000000000 --- a/pkgs/applications/science/math/sage/patches/pari-stackwarn.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/sage/doctest/parsing.py b/src/sage/doctest/parsing.py -index 6bdc9a0..31fc780 100644 ---- a/src/sage/doctest/parsing.py -+++ b/src/sage/doctest/parsing.py -@@ -40,6 +40,7 @@ from .external import available_software - - float_regex = re.compile('\s*([+-]?\s*((\d*\.?\d+)|(\d+\.?))([eE][+-]?\d+)?)') - optional_regex = re.compile(r'(py2|py3|long time|not implemented|not tested|known bug)|([^ a-z]\s*optional\s*[:-]*((\s|\w)*))') -+pari_stack_warning_regex = re.compile(r'\s*\*\*\*.*(Warning: increasing stack size to )\d+\.') - find_sage_prompt = re.compile(r"^(\s*)sage: ", re.M) - find_sage_continuation = re.compile(r"^(\s*)\.\.\.\.:", re.M) - random_marker = re.compile('.*random', re.I) -@@ -935,6 +936,7 @@ class SageOutputChecker(doctest.OutputChecker): - <type 'float'> - """ - got = self.human_readable_escape_sequences(got) -+ got = pari_stack_warning_regex.sub('', got) - if isinstance(want, MarkedOutput): - if want.random: - return True diff --git a/pkgs/applications/science/math/sage/patches/pillow-update.patch b/pkgs/applications/science/math/sage/patches/pillow-update.patch new file mode 100644 index 0000000000000..19d615522626d --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/pillow-update.patch @@ -0,0 +1,39 @@ +diff --git a/src/sage/repl/image.py b/src/sage/repl/image.py +index d7d00b0..cd1607a 100644 +--- a/src/sage/repl/image.py ++++ b/src/sage/repl/image.py +@@ -77,7 +77,7 @@ class Image(SageObject): + + - ``size`` -- 2-tuple, containing (width, height) in pixels. + +- - ``color`` -- string or tuple of numeric. What colour to use ++ - ``color`` -- string, numeric or tuple of numeric. What colour to use + for the image. Default is black. If given, this should be a + a tuple with one value per band. When creating RGB images, + you can also use colour strings as supported by the +@@ -91,9 +91,15 @@ class Image(SageObject): + EXAMPLES:: + + sage: from sage.repl.image import Image +- sage: Image('P', (16, 16), (13,)) ++ sage: Image('P', (16, 16), 13) + 16x16px 8-bit Color image + """ ++ # pillow does not support Sage integers as color ++ from sage.rings.integer import Integer ++ if isinstance(color, Integer): ++ color = int(color) ++ elif isinstance(color, tuple): ++ color = tuple(int(i) if isinstance(i, Integer) else i for i in color) + self._pil = PIL.Image.new(mode, size, color) + + @property +@@ -233,7 +239,7 @@ class Image(SageObject): + EXAMPLES:: + + sage: from sage.repl.image import Image +- sage: img = Image('P', (12, 34), (13,)) ++ sage: img = Image('P', (12, 34), 13) + sage: filename = tmp_filename(ext='.png') + sage: img.save(filename) + sage: with open(filename, 'rb') as f: diff --git a/pkgs/applications/science/math/sage/patches/python-5755-hotpatch.patch b/pkgs/applications/science/math/sage/patches/python-5755-hotpatch.patch deleted file mode 100644 index 1b64f39fe60f9..0000000000000 --- a/pkgs/applications/science/math/sage/patches/python-5755-hotpatch.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/sage/all.py b/src/sage/all.py -index ca309ef..be3186b 100644 ---- a/src/sage/all.py -+++ b/src/sage/all.py -@@ -298,6 +298,23 @@ warnings.filterwarnings('ignore', module='matplotlib[.]font_manager') - warnings.filterwarnings('default', - '[\s\S]*See http://trac.sagemath.org/[0-9]* for details.') - -+# Hotpatch around https://bugs.python.org/issue5755 which won't be fixed for -+# python 2.7. Idea by https://stackoverflow.com/a/36293331. -+from distutils.command.build_ext import build_ext -+from distutils.sysconfig import customize_compiler -+ -+_build_extensions = build_ext.build_extensions -+ -+def build_extensions_patched(self): -+ customize_compiler(self.compiler) -+ try: -+ self.compiler.compiler_so.remove("-Wstrict-prototypes") -+ except (AttributeError, ValueError): -+ pass -+ _build_extensions(self) -+ -+build_ext.build_extensions = build_extensions_patched -+ - - # Set a new random number seed as the very last thing - # (so that printing initial_seed() and using that seed diff --git a/pkgs/applications/science/math/sage/patches/register-pretty-printer-earlier.patch b/pkgs/applications/science/math/sage/patches/register-pretty-printer-earlier.patch new file mode 100644 index 0000000000000..83bd83a6d33bd --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/register-pretty-printer-earlier.patch @@ -0,0 +1,36 @@ +diff --git a/src/sage/doctest/forker.py b/src/sage/doctest/forker.py +index cb3667659e..867f547d71 100644 +--- a/src/sage/doctest/forker.py ++++ b/src/sage/doctest/forker.py +@@ -200,6 +200,15 @@ def init_sage(controller=None): + from sage.cpython._py2_random import Random + sage.misc.randstate.DEFAULT_PYTHON_RANDOM = Random + ++ # IPython's pretty printer sorts the repr of dicts by their keys by default ++ # (or their keys' str() if they are not otherwise orderable). However, it ++ # disables this for CPython 3.6+ opting to instead display dicts' "natural" ++ # insertion order, which is preserved in those versions). ++ # However, this order is random in some instances. ++ # Also modifications of code may affect the order. ++ # So here we fore sorted dict printing. ++ IPython.lib.pretty.for_type(dict, _sorted_dict_pprinter_factory('{', '}')) ++ + if controller is None: + import sage.repl.ipython_kernel.all_jupyter + else: +@@ -222,15 +231,6 @@ def init_sage(controller=None): + from sage.repl.rich_output.backend_doctest import BackendDoctest + dm.switch_backend(BackendDoctest()) + +- # IPython's pretty printer sorts the repr of dicts by their keys by default +- # (or their keys' str() if they are not otherwise orderable). However, it +- # disables this for CPython 3.6+ opting to instead display dicts' "natural" +- # insertion order, which is preserved in those versions). +- # However, this order is random in some instances. +- # Also modifications of code may affect the order. +- # So here we fore sorted dict printing. +- IPython.lib.pretty.for_type(dict, _sorted_dict_pprinter_factory('{', '}')) +- + # Switch on extra debugging + from sage.structure.debug_options import debug + debug.refine_category_hash_check = True diff --git a/pkgs/applications/science/math/sage/patches/sagenb-cmp-deprecation.patch b/pkgs/applications/science/math/sage/patches/sagenb-cmp-deprecation.patch deleted file mode 100644 index 9f502a6695173..0000000000000 --- a/pkgs/applications/science/math/sage/patches/sagenb-cmp-deprecation.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sagenb/__init__.py b/sagenb/__init__.py -index 4db0d2cb..2fc5f01e 100644 ---- a/sagenb/__init__.py -+++ b/sagenb/__init__.py -@@ -1,3 +1,8 @@ - # -*- coding: utf-8 -* - # init -+import warnings - from . import storage -+ -+# deprecation in attrs, needs to be fixed in twisted -+warnings.filterwarnings('ignore', category=DeprecationWarning, -+ message=r'The usage of `cmp` is deprecated and will be removed.*') diff --git a/pkgs/applications/science/math/sage/patches/sagespawn-implicit-casting.patch b/pkgs/applications/science/math/sage/patches/sagespawn-implicit-casting.patch new file mode 100644 index 0000000000000..2ee5db3e29c0b --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/sagespawn-implicit-casting.patch @@ -0,0 +1,13 @@ +diff --git a/src/sage/interfaces/sagespawn.pyx b/src/sage/interfaces/sagespawn.pyx +index 9041238f1d..469befbc66 100644 +--- a/src/sage/interfaces/sagespawn.pyx ++++ b/src/sage/interfaces/sagespawn.pyx +@@ -228,7 +228,7 @@ class SagePtyProcess(PtyProcess): + Check that the process eventually dies after calling + ``terminate_async``:: + +- sage: s.ptyproc.terminate_async(interval=0.2) ++ sage: s.ptyproc.terminate_async(interval=float(0.2)) + sage: while True: + ....: try: + ....: os.kill(s.pid, 0) diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch index 56f092796229a..661077cfa8cdb 100644 --- a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch +++ b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch @@ -36,7 +36,7 @@ index 73a078e619..059125c59f 100644 # Run Sphinx with Sage's special logger - sys.argv = ["sphinx-build"] + build_command.split() - from .sphinxbuild import runsphinx -+ args = "python -um sage_setup.docbuild.sphinxbuild -N".split() + build_command.split() ++ args = "python3 -um sage_setup.docbuild.sphinxbuild -N".split() + build_command.split() try: - runsphinx() + subprocess.check_call(args) diff --git a/pkgs/applications/science/math/sage/patches/sympow-cache.patch b/pkgs/applications/science/math/sage/patches/sympow-cache.patch index 20020d610f80f..d71f3acbc706e 100644 --- a/pkgs/applications/science/math/sage/patches/sympow-cache.patch +++ b/pkgs/applications/science/math/sage/patches/sympow-cache.patch @@ -1,5 +1,5 @@ diff --git a/src/sage/lfunctions/sympow.py b/src/sage/lfunctions/sympow.py -index 1640ac4f6a..03578be7b8 100644 +index 92cb01fd73..b123e6accc 100644 --- a/src/sage/lfunctions/sympow.py +++ b/src/sage/lfunctions/sympow.py @@ -50,6 +50,7 @@ from __future__ import print_function, absolute_import @@ -8,14 +8,14 @@ index 1640ac4f6a..03578be7b8 100644 +from sage.env import DOT_SAGE from sage.structure.sage_object import SageObject - from sage.misc.all import pager, verbose - import sage.rings.all -@@ -76,7 +77,7 @@ class Sympow(SageObject): + from sage.misc.all import pager + from sage.misc.verbose import verbose +@@ -78,7 +79,7 @@ class Sympow(SageObject): """ Used to call sympow with given args """ -- cmd = 'sympow %s'%args +- cmd = 'sympow %s' % args + cmd = 'env SYMPOW_CACHEDIR="%s/sympow///" sympow %s' % (DOT_SAGE, args) - v = os.popen(cmd).read().strip() + with os.popen(cmd) as f: + v = f.read().strip() verbose(v, level=2) - return v diff --git a/pkgs/applications/science/math/sage/pybrial.nix b/pkgs/applications/science/math/sage/pybrial.nix deleted file mode 100644 index 5fc8a4aa6f488..0000000000000 --- a/pkgs/applications/science/math/sage/pybrial.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv -, fetchFromGitHub -, buildPythonPackage -, brial -}: -# This has a cyclic dependency with sage. I don't include sage in the -# buildInputs and let python figure it out at runtime. Because of this, -# I don't include the package in the main nipxkgs tree. It wouldn't be useful -# outside of sage anyways (as you could just directly depend on sage and use -# it). -buildPythonPackage rec { - pname = "pyBRiAl"; - version = brial.version; - - # included with BRiAl source - src = brial.src; - - sourceRoot = "source/sage-brial"; - - meta = with stdenv.lib; { - description = "python implementation of BRiAl"; - license = licenses.gpl2; - maintainers = teams.sage.members; - }; -} diff --git a/pkgs/applications/science/math/sage/python-openid.nix b/pkgs/applications/science/math/sage/python-openid.nix deleted file mode 100644 index 1e8a908ac79ae..0000000000000 --- a/pkgs/applications/science/math/sage/python-openid.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, isPy3k -, django -, nose -, twill -, pycrypto -}: - -buildPythonPackage rec { - pname = "python-openid"; - version = "2.2.5"; - - disabled = isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "1vvhxlghjan01snfdc4k7ykd80vkyjgizwgg9bncnin8rqz1ricj"; - }; - - propagatedBuildInputs = [ - pycrypto - ]; - - # Cannot access the djopenid example module. - # I don't know how to fix that (adding the examples dir to PYTHONPATH doesn't work) - doCheck = false; - checkInputs = [ nose django twill ]; - checkPhase = '' - nosetests - ''; - - meta = with stdenv.lib; { - description = "OpenID library for Python"; - license = licenses.asl20; - maintainers = teams.sage.members; - homepage = "https://github.com/openid/python-openid/"; - }; -} diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index ba7f6ccd18b5d..568a4a39f3936 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -1,7 +1,6 @@ { stdenv , lib , writeTextFile -, python , sagelib , env-locations , gfortran @@ -67,11 +66,6 @@ let "@sage-local@" "@sage-local@/build" pythonEnv - # empty python env to add python wrapper that clears PYTHONHOME (see - # wrapper.nix). This is necessary because sage will call the python3 binary - # (from python2 code). The python2 PYTHONHOME (again set in wrapper.nix) - # will then confuse python3, if it is not overwritten. - python3.buildEnv gfortran # for inline fortran stdenv.cc # for cython bash @@ -129,8 +123,21 @@ writeTextFile rec { ] }' export SAGE_ROOT='${sagelib.src}' - export SAGE_LOCAL='@sage-local@' + '' + + # TODO: is using pythonEnv instead of @sage-local@ here a good + # idea? there is a test in src/sage/env.py that checks if the values + # SAGE_ROOT and SAGE_LOCAL set here match the ones set in env.py. + # we fix up env.py's SAGE_ROOT in sage-src.nix (which does not + # have access to sage-with-env), but env.py autodetects + # SAGE_LOCAL to be pythonEnv. + # setting SAGE_LOCAL to pythonEnv also avoids having to create + # python3, ipython, ipython3 and jupyter symlinks in + # sage-with-env.nix. + '' + export SAGE_LOCAL='${pythonEnv}' + export SAGE_SHARE='${sagelib}/share' + export SAGE_ENV_CONFIG_SOURCED=1 # sage-env complains if sage-env-config is not sourced beforehand orig_path="$PATH" export PATH='${runtimepath}' @@ -177,9 +184,9 @@ writeTextFile rec { ]) }' - export SAGE_LIB='${sagelib}/${python.sitePackages}' + export SAGE_LIB='${sagelib}/${python3.sitePackages}' - export SAGE_EXTCODE='${sagelib.src}/src/ext' + export SAGE_EXTCODE='${sagelib.src}/src/sage/ext_data' # for find_library export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [stdenv.cc.libc singular]}''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 4791d12450a93..8948621a025a8 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -10,44 +10,23 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.9"; + version = "9.2"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "1bwga58x3s8z42w5h51c232f91ndsc1861dlb1glhax3pn0rhn3a"; + sha256 = "103j8d5x6szl9fxaz0dvdi4y47q1af9h9y5hmjh2xayi62qmp5ql"; }; # Patches needed because of particularities of nix or the way this is packaged. # The goal is to upstream all of them and get rid of this list. nixPatches = [ - # https://trac.sagemath.org/ticket/25358 - (fetchpatch { - name = "safe-directory-test-without-patch.patch"; - url = "https://git.sagemath.org/sage.git/patch?id2=8bdc326ba57d1bb9664f63cf165a9e9920cc1afc&id=dc673c17555efca611f68398d5013b66e9825463"; - sha256 = "1hhannz7xzprijakn2w2d0rhd5zv2zikik9p51i87bas3nc658f7"; - }) - - # `is_unitary` test in `matrix_double_dense.pyx` fails with some BLAS implementations - # https://trac.sagemath.org/ticket/29297 should be included in 9.1 - (fetchpatch { - name = "is_unitary-special-case.patch"; - url = "https://git.sagemath.org/sage.git/patch?id=cc3eb9ffa991e328b09028d32aab7e7cc2ddbb6a"; - sha256 = "0jq4w8hnp5c9q99011ldr4n3knvm1rx2g85z0hidv3i9x868p0ay"; - }) - - # Unfortunately inclusion in upstream sage was rejected. Instead the bug was - # fixed in python, but of course not backported to 2.7. So we'll probably - # have to keep this around until 2.7 is deprecated. - # https://trac.sagemath.org/ticket/25316 - # https://github.com/python/cpython/pull/7476 - ./patches/python-5755-hotpatch.patch - # Make sure py2/py3 tests are only run when their expected context (all "sage" # tests) are also run. That is necessary to test dochtml individually. See # https://trac.sagemath.org/ticket/26110 for an upstream discussion. + # TODO: Determine if it is still necessary. ./patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch # Fixes a potential race condition which can lead to transient doctest failures. @@ -61,10 +40,17 @@ stdenv.mkDerivation rec { # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE ./patches/sphinx-docbuild-subprocesses.patch - # Fix doctest failures with docutils 0.15: - # https://nix-cache.s3.amazonaws.com/log/dzmzrb2zvardsmpy7idg7djkizmkzdhs-sage-tests-8.9.drv - # https://trac.sagemath.org/ticket/28856#comment:19 - ./patches/docutils-0.15.patch + # Sage's workaround to pretty print dicts (in + # src/sage/doctest/forker.py:init_sage) runs too late (after + # controller.load_environment(), which imports sage.all.*) to to + # affect sage.sandpiles.Sandpile{Config,Divisor}'s pretty printer. + # Due to the sandpiles module being lazily loaded, this only + # affects the first run (subsequent runs read from an import cache + # at ~/.sage/cache and are not affected), which is probably why + # other distributions don't hit this bug. This breaks two sandpile + # tests, so do the workaround a little bit earlier. + # https://trac.sagemath.org/ticket/31053 + ./patches/register-pretty-printer-earlier.patch ]; # Since sage unfortunately does not release bugfix releases, packagers must @@ -74,6 +60,17 @@ stdenv.mkDerivation rec { # To help debug the transient error in # https://trac.sagemath.org/ticket/23087 when it next occurs. ./patches/configurationpy-error-verbose.patch + + # fix intermittent errors in Sage 9.2's psage.py (this patch is + # already included in Sage 9.3): https://trac.sagemath.org/ticket/30730 + (fetchpatch { + name = "fix-psage-is-locked.patch"; + url = "https://git.sagemath.org/sage.git/patch/?id=75df605f216ddc7b6ca719be942d666b241520e9"; + sha256 = "0g9pl1wbb3sgs26d3bvv70cpa77sfskylv4kd255y1794f1fgk4q"; + }) + + # fix intermittent errors in sagespawn.pyx: https://trac.sagemath.org/ticket/31052 + ./patches/sagespawn-implicit-casting.patch ]; # Patches needed because of package updates. We could just pin the versions of @@ -96,55 +93,16 @@ stdenv.mkDerivation rec { } // builtins.removeAttrs args [ "rev" "base" ]) ); in [ - # New glpk version has new warnings, filter those out until upstream sage has found a solution - # Should be fixed with glpk > 4.65. - # https://trac.sagemath.org/ticket/24824 - ./patches/pari-stackwarn.patch # not actually necessary since the pari upgrade, but necessary for the glpk patch to apply - (fetchpatch { - url = "https://salsa.debian.org/science-team/sagemath/raw/58bbba93a807ca2933ca317501d093a1bb4b84db/debian/patches/dt-version-glpk-4.65-ignore-warnings.patch"; - sha256 = "0b9293v73wb4x13wv5zwyjgclc01zn16msccfzzi6znswklgvddp"; - stripLen = 1; - }) - # After updating smypow to (https://trac.sagemath.org/ticket/3360) we can # now set the cache dir to be withing the .sage directory. This is not # strictly necessary, but keeps us from littering in the user's HOME. ./patches/sympow-cache.patch - # https://trac.sagemath.org/ticket/28472 - (fetchpatch { - name = "eclib-20190909.patch"; - url = "https://git.sagemath.org/sage.git/patch?id=d27dc479a5772d59e4bc85d805b6ffd595284f1d"; - sha256 = "1nf1s9y7n30lhlbdnam7sghgaq9nasmv96415gl5jlcf7a3hlxk3"; - }) - # ignore a deprecation warning for usage of `cmp` in the attrs library in the doctests ./patches/ignore-cmp-deprecation.patch - # Werkzeug has deprecated ImmutableDict, but it is still used in legacy - # sagenb. That's no big issue since sagenb will be removed soon anyways. - ./patches/ignore-werkzeug-immutable-dict-deprecation.patch - - # threejs r109 (#28560) - (fetchpatch { - name = "threejs-r109.patch"; - url = "https://git.sagemath.org/sage.git/patch?id=fcc11d6effa39f375bc5f4ea5831fb7a2f2767da"; - sha256 = "0hnmc8ld3bblks0hcjvjjaydkgwdr1cs3dbl2ys4gfq964pjgqwc"; - }) - - # https://trac.sagemath.org/ticket/28911 - (fetchpatch { - name = "sympy-1.5.patch"; - url = "https://git.sagemath.org/sage.git/patch/?h=c6d0308db15efd611211d26cfcbefbd180fc0831"; - sha256 = "0nwai2jr22h49km4hx3kwafs3mzsc5kwsv7mqwjf6ibwfx2bbgyq"; - }) - - # https://trac.sagemath.org/ticket/29313 (patch from ArchLinux) - (fetchpatch { - name = "pari-2.11.3.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/sagemath-pari-2.11.3.patch?h=sagemath-git&id=02e1d58bd1cd70935d69a4990469d18be6bd2c43"; - sha256 = "0z07444zvijyw96d11q7j81pvg7ysd6ycf1bbbjr6za9y74hv7d2"; - }) + # adapt sage's Image class to pillow 8.0.1 (https://trac.sagemath.org/ticket/30971) + ./patches/pillow-update.patch ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; @@ -152,16 +110,16 @@ stdenv.mkDerivation rec { postPatch = '' # make sure shebangs etc are fixed, but sage-python23 still works find . -type f -exec sed \ - -e 's/sage-python23/python/g' \ + -e 's/sage-python23/python3/g' \ -i {} \; echo '#!${runtimeShell} - python "$@"' > build/bin/sage-python23 + python3 "$@"' > build/bin/sage-python23 # Make sure sage can at least be imported without setting any environment # variables. It won't be close to feature complete though. sed -i \ - "s|var('SAGE_LOCAL',.*|var('SAGE_LOCAL', '$out/src')|" \ + "s|var('SAGE_ROOT'.*|var('SAGE_ROOT', '$out')|" \ src/sage/env.py # Do not use sage-env-config (generated by ./configure). @@ -169,7 +127,39 @@ stdenv.mkDerivation rec { echo '# do nothing' > src/bin/sage-env-config ''; - configurePhase = "# do nothing"; + # Test src/doc/en/reference/spkg/conf.py will fail if + # src/doc/en/reference/spkg/index.rst is not generated. It is + # generated by src/doc/bootstrap, so I've copied the relevant part + # here. An alternative would be to create an empty + # src/doc/en/reference/spkg/index.rst file. + configurePhase = '' + OUTPUT_DIR="src/doc/en/reference/spkg" + mkdir -p "$OUTPUT_DIR" + OUTPUT_INDEX="$OUTPUT_DIR"/index.rst + cat > "$OUTPUT_INDEX" <<EOF + + External Packages + ================= + + .. toctree:: + :maxdepth: 1 + + EOF + for PKG_SCRIPTS in build/pkgs/*; do + if [ -d "$PKG_SCRIPTS" ]; then + PKG_BASE=$(basename "$PKG_SCRIPTS") + if [ -f "$PKG_SCRIPTS"/SPKG.rst ]; then + # Instead of just copying, we may want to call + # a version of sage-spkg-info to format extra information. + cp "$PKG_SCRIPTS"/SPKG.rst "$OUTPUT_DIR"/$PKG_BASE.rst + echo >> "$OUTPUT_INDEX" " $PKG_BASE" + fi + fi + done + cat >> "$OUTPUT_INDEX" <<EOF + .. include:: ../footer.txt + EOF + ''; buildPhase = "# do nothing"; diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 87c1e07f5307b..f204d97961b65 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -13,7 +13,7 @@ , pari , gmp , gfan -, python2 +, python3 , flintqs , eclib , ntl @@ -50,11 +50,11 @@ let ]; # remove python prefix, replace "-" in the name by "_", apply patch_names - # python2.7-some-pkg-1.0 -> some_pkg-1.0 + # python3.8-some-pkg-1.0 -> some_pkg-1.0 pkg_to_spkg_name = pkg: patch_names: let parts = lib.splitString "-" pkg.name; - # remove python2.7- - stripped_parts = if (builtins.head parts) == python2.libPrefix then builtins.tail parts else parts; + # remove python3.8- + stripped_parts = if (builtins.head parts) == python3.libPrefix then builtins.tail parts else parts; version = lib.last stripped_parts; orig_pkgname = lib.init stripped_parts; pkgname = patch_names (lib.concatStringsSep "_" orig_pkgname); diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index a21bffea14cd8..e2acef7b8eb55 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - broken = true; description = "Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"; license = licenses.gpl2; maintainers = teams.sage.members; diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix index bf618fe64f45f..a10672f3a0921 100644 --- a/pkgs/applications/science/math/sage/sagedoc.nix +++ b/pkgs/applications/science/math/sage/sagedoc.nix @@ -1,6 +1,6 @@ { stdenv , sage-with-env -, python +, python3 , maxima-ecl , tachyon , jmol @@ -17,16 +17,15 @@ stdenv.mkDerivation rec { # modules are imported and because matplotlib is used to produce plots. buildInputs = [ sage-with-env.env.lib - python + python3 maxima-ecl tachyon jmol cddlib - ] ++ (with python.pkgs; [ + ] ++ (with python3.pkgs; [ psutil future sphinx - sagenb scipy sympy matplotlib @@ -35,8 +34,6 @@ stdenv.mkDerivation rec { ipykernel ipywidgets jupyter_client - typing - pybrial ]); unpackPhase = '' @@ -47,13 +44,26 @@ stdenv.mkDerivation rec { chmod -R 755 "$SAGE_DOC_SRC_OVERRIDE" ''; + postPatch = '' + # src/doc/bootstrap generates installation instructions for + # arch, debian, fedora, cygwin and homebrew. as a hack, disable + # including the generated files. + sed -i "/literalinclude/d" $SAGE_DOC_SRC_OVERRIDE/en/installation/source.rst + ''; + buildPhase = '' export SAGE_NUM_THREADS="$NIX_BUILD_CORES" export HOME="$TMPDIR/sage_home" mkdir -p "$HOME" # needed to link them in the sage docs using intersphinx - export PPLPY_DOCS=${python.pkgs.pplpy.doc}/share/doc/pplpy + export PPLPY_DOCS=${python3.pkgs.pplpy.doc}/share/doc/pplpy + + # adapted from src/doc/bootstrap + OUTPUT_DIR="$SAGE_DOC_SRC_OVERRIDE/en/reference/repl" + mkdir -p "$OUTPUT_DIR" + OUTPUT="$OUTPUT_DIR/options.txt" + ${sage-with-env}/bin/sage -advanced > "$OUTPUT" ${sage-with-env}/bin/sage -python -m sage_setup.docbuild \ --mathjax \ diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 830d806a8bcd3..1c2235bf71b43 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -15,6 +15,7 @@ , ecm , flint , gd +, giac , givaro , glpk , gsl @@ -51,6 +52,7 @@ , libbraiding , gmpy2 , pplpy +, sqlite }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -94,6 +96,7 @@ buildPythonPackage rec { ecm fflas-ffpack flint + giac givaro glpk gsl @@ -124,6 +127,7 @@ buildPythonPackage rec { libbraiding gmpy2 pplpy + sqlite ]; buildPhase = '' diff --git a/pkgs/applications/science/math/sage/sagenb.nix b/pkgs/applications/science/math/sage/sagenb.nix deleted file mode 100644 index ad5c53b6c1184..0000000000000 --- a/pkgs/applications/science/math/sage/sagenb.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, python -, buildPythonPackage -, fetchFromGitHub -, mathjax -, twisted -, flask -, flask-oldsessions -, flask-openid -, flask-autoindex -, flask-babel -}: - -# Has a cyclic dependency with sage (not expressed here) and is not useful outside of sage. -# Deprecated, hopefully soon to be removed. See -# https://trac.sagemath.org/ticket/25837 - -buildPythonPackage rec { - pname = "sagenb"; - version = "1.1.2"; - - src = fetchFromGitHub { - owner = "sagemath"; - repo = "sagenb"; - rev = version; - sha256 = "0bxvhr03qh2nsjdfc4pyfiqrn9jhp3vf7irsc9gqx0185jlblbxs"; - }; - - patches = [ - # cmp deprecation in attrs needs to be handled in twisted - ./patches/sagenb-cmp-deprecation.patch - ]; - - propagatedBuildInputs = [ - twisted - flask - flask-oldsessions - flask-openid - flask-autoindex - flask-babel - ]; - - # tests depend on sage - doCheck = false; - - meta = with stdenv.lib; { - description = "Sage Notebook"; - license = licenses.gpl3Plus; - maintainers = teams.sage.members; - }; - - # let sagenb use mathjax - postInstall = '' - mkdir -p "$out/${python.sitePackages}/sagenb/data" - ln -s ${mathjax}/lib/node_modules/mathjax "$out/${python.sitePackages}/sagenb/data/mathjax" - ''; -} diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 0ba1cd0d2faf4..11d73095834f9 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -18,14 +18,14 @@ in stdenv.mkDerivation rec { pname = "simgrid"; - version = "3.25"; + version = "3.26"; src = fetchFromGitLab { domain = "framagit.org"; owner = pname; repo = pname; rev = "v${version}"; - sha256 = "019fgryfwpcrkv1f3271v7qxk0mfw2w990vgnk1cqhmr9i1f17gs"; + sha256 = "0kwiggdjqjhjvmwb1m7hb9clvm3xz948fy5ia67dif2pakwad754"; }; nativeBuildInputs = [ cmake perl python3 boost valgrind ] diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index a71ddc874c9d0..8e7c5bddd961c 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.29"; + version = "1.8.30"; src = fetchPypi { inherit pname version; - sha256 = "8f5900dc0a404ab9cf5a00155f83e9aaeab18161ce21a352dfdcf2d7abf5d78e"; + sha256 = "fe046481b793b592334749249620fce8a463f4c46b394ff744645975465d677b"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/science/robotics/mission-planner/default.nix b/pkgs/applications/science/robotics/mission-planner/default.nix new file mode 100644 index 0000000000000..5ae04d8a84b73 --- /dev/null +++ b/pkgs/applications/science/robotics/mission-planner/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono6 }: + +let + pname = "mission-planner"; + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + comment = "MissionPlanner GCS & Ardupilot configuration tool"; + desktopName = "MissionPlanner"; + genericName = "Ground Control Station"; + }; +in stdenv.mkDerivation rec { + inherit pname; + version = "1.3.74"; + + src = fetchurl { + url = "https://firmware.ardupilot.org/Tools/MissionPlanner/MissionPlanner-${version}.zip"; + sha256 = "1cgpmsmmnbzw1lwsdafp8yklk1rwc61yf12vc1ahcc6bl7q2385x"; + }; + + nativeBuildInputs = [ makeWrapper mono6 unzip ]; + sourceRoot = "."; + + AOT_FILES = [ "MissionPlanner.exe" "MissionPlanner.*.dll" ]; + + buildPhase = '' + runHook preBuild + for file in $AOT_FILES + do + mono --aot $file + done + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,opt/mission-planner} + install -m 444 -D mpdesktop150.png $out/share/icons/mission-planner.png + cp -r ${desktopItem}/share/applications $out/share/ + mv * $out/opt/mission-planner + makeWrapper ${mono6}/bin/mono $out/bin/mission-planner \ + --add-flags $out/opt/mission-planner/MissionPlanner.exe + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "An ArduPilot ground station"; + longDescription = '' + Full-featured ground station application for the ArduPilot open source + autopilot project. Lets you both flash, configure and control ArduPilot + Plane, Copter and Rover targets. + ''; + homepage = "https://ardupilot.org/planner/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ wucke13 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index b6a93aefb594f..2fa03a97e8bc9 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.19.2"; + version = "0.19.3"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "06mlrc283k5f75y36fmmaxnj29jfc1s8vaykjph6a86m1gcl5wgi"; + sha256 = "0r49bybqy6c0n1lz6yc85py80wb40w757m60f5rszjf200wnyl6s"; }; buildInputs = [ diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 1ec704f5d4389..d06a66edf1af3 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "362"; + version = "363"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "HU/+Im+o8CGFm7wwB3iP9jpGoxJC2b2ae9fr4k6BrKI="; + sha256 = "2Bo2OeJlUrZ2W9zyi+Hs24rKv5B5VXCOgwrWOX6hC0g="; }; buildInputs = [ diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index f8ad81c605818..6d39ae0931cdb 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.12.1"; + version = "2.13"; src = fetchurl { urls = @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; name = "${pname}-${version}.tar.gz"; - sha256 = "00v6gmn2wpfms5jzf103hkm5s8i3bfs5mzacmznlhdzdrzzjc8w2"; + sha256 = "1xbk7bb7340x2vvn22ykii54v721fwk8vgr3xvjkvv8ff7hd6cyr"; }; nativeBuildInputs = [ installShellFiles tcl ]; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index bf6591a8cb9c5..46b27e95c798b 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -38,6 +38,8 @@ let ghq = callPackage ./ghq { }; + ghr = callPackage ./ghr { }; + git = appendToName "minimal" gitBase; git-absorb = callPackage ./git-absorb { @@ -201,6 +203,7 @@ let gitui = callPackage ./gitui { inherit (darwin.apple_sdk.frameworks) Security AppKit; + inherit (pkgs) openssl perl; }; glab = callPackage ./glab { }; diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index f667a7b6d8c11..0fa30651170aa 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "1ng22g9h1l1v2yav8zh6w4nn6ifv8sfz8566m8155d0cza2iimw6"; + sha256 = "0rh902h76pn7ja5zizlfklmwcyyki4b0v4irw1j40cjjnah75ljp"; }; - cargoSha256 = "0b3qv1ksk8fmpawih2qrz29wlpj1gvq9hw4yqm7hdk6awl5h8lvv"; + cargoSha256 = "1rniihx1rb18n2bp4b2yhn4ayih5cbcyqmiv6jckas7jwrgk6wra"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/ghr/default.nix b/pkgs/applications/version-management/git-and-tools/ghr/default.nix new file mode 100644 index 0000000000000..be6d64646a593 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/ghr/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ghr"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "tcnksm"; + repo = "ghr"; + rev = "v${version}"; + sha256 = "1nm5kdjkqayxh06j9nr5daic9sw9nx9w06y9gaqhdrw9byvjpr1a"; + }; + + vendorSha256 = "14avsngzhl1b8a05i43ph6sxh9vj0jls0acxr9j7r0h3f0vpamcj"; + + # Tests require a Github API token, and networking + doCheck = false; + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/ghr --version + ''; + + meta = with lib; { + homepage = "https://github.com/tcnksm/ghr"; + description = "Upload multiple artifacts to GitHub Release in parallel"; + license = licenses.mit; + maintainers = [ maintainers.ivar ]; + }; +} 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 dac3c54a16a6b..3fb8b2f35e8d3 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 = "2.15.7"; + version = "2.15.9"; src = fetchPypi { inherit pname version; - sha256 = "0djbl4s9i7bs7kkldr7453yayi38s8mx0i41mkd0j2cvv5r9himr"; + sha256 = "0sg9ci9q1v3975855vi491ass72ladp3bjj2mvg77yxj13g3qqsx"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index a99ff3c2e08c0..a6ca3126d5ce8 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "0skpi22plzb9r9cgqfnjzpaz856q9f4n0gd5i97nv8bfny8hl30z"; + sha256 = "1w5kpca2v6iii912riywp1jscq7cpr5xv93mglr30pjnar1mk8gs"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "10x faster implementation of `git status` command"; homepage = "https://github.com/romkatv/gitstatus"; - license = [ licenses.gpl3 ]; + license = licenses.gpl3Only; maintainers = with maintainers; [ mmlb hexa ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 21e382a44bc87..f89349aaeaa5f 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,20 +1,20 @@ -{ stdenv, rustPlatform, fetchFromGitHub, libiconv, xorg, python3, Security, AppKit }: +{ stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "1ifwbi6nydh66z6cprjmz2qvy9z52rj9jg2xf054i249gy955hah"; + sha256 = "0yq98jslbac87zdzlwqc2kcd6hqy2wnza3l8n3asss1iaqcb0ilh"; }; - cargoSha256 = "1454dn7k1fc4yxhbcmx0z3hj9d9srnlc2k1qp707h1vq46ib1rsf"; + cargoSha256 = "16riggrhk1f6lg8y46wn89ab5b1iz6lw00ngid20x4z32d2ww70f"; - nativeBuildInputs = [ python3 ]; - buildInputs = [ ] - ++ stdenv.lib.optional stdenv.isLinux xorg.libxcb + nativeBuildInputs = [ python3 perl ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optional stdenv.isLinux xclip ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 340ab283bf6e6..ffbeb050956d2 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "090i4hk9mb66ia14kyp7rqymhc897yi1ifb0skvknylx0sw8vhk9"; + sha256 = "sha256-tah7ciq+jkkROJq/V+yPRtWPuWaSnf5hKndjnifsQYc="; }; unpackPhase = '' diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 866b7efa4236b..c6d4401fde4a3 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.6.1", - "repo_hash": "0kfh9ngykrnvvjpx4m69pfyfvsvvqfxzlxhm8dgx9ypz4bpmr947", + "version": "13.7.1", + "repo_hash": "13bbi9ps6z8q9di9gni2ckydgfk7pxkaqf0wgx8gfwm80sc7s0km", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.6.1-ee", + "rev": "v13.7.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.6.1", - "GITLAB_PAGES_VERSION": "1.30.0", - "GITLAB_SHELL_VERSION": "13.13.0", - "GITLAB_WORKHORSE_VERSION": "8.54.0" + "GITALY_SERVER_VERSION": "13.7.1", + "GITLAB_PAGES_VERSION": "1.32.0", + "GITLAB_SHELL_VERSION": "13.14.0", + "GITLAB_WORKHORSE_VERSION": "8.58.0" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index d8564dca87795..0a7fcd7c260d7 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gem 'rugged', '~> 0.28' -gem 'github-linguist', '~> 7.11', require: 'linguist' +gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' gem 'activesupport', '~> 6.0.3.3' gem 'rdoc', '~> 6.0' diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index a633e067f0d9c..eb5c86946d7a7 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -45,7 +45,7 @@ GEM ffi (1.13.1) gemojione (3.3.0) json - github-linguist (7.11.0) + github-linguist (7.12.1) charlock_holmes (~> 0.7.7) escape_utils (~> 1.2.0) mini_mime (~> 1.0) @@ -134,7 +134,7 @@ GEM redis (4.1.3) regexp_parser (1.8.1) rexml (3.2.4) - rouge (3.24.0) + rouge (3.26.0) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -197,7 +197,7 @@ DEPENDENCIES activesupport (~> 6.0.3.3) factory_bot faraday (~> 1.0) - github-linguist (~> 7.11) + github-linguist (~> 7.12) gitlab-gollum-lib (~> 4.2.7.9) gitlab-gollum-rugged_adapter (~> 0.4.4.2) gitlab-labkit (~> 0.13.2) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 57465f808df5d..e8c99198df40e 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -4,6 +4,18 @@ , libgit2, openssl, zlib, pcre, http-parser }: let + # libgit2 was updated to 1.1.0 in nixpkgs, but gitlab doesn't support that yet. + # See https://github.com/NixOS/nixpkgs/pull/106909 + libgit = libgit2.overrideAttrs (attrs: rec { + version = "1.0.0"; + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "06cwrw93ycpfb5kisnsa5nsy95pm11dbh0vvdjg1jn25h9q5d3vc"; + }; + }); + rubyEnv = bundlerEnv rec { name = "gitaly-env"; inherit ruby; @@ -21,17 +33,17 @@ let }; }; in buildGoModule rec { - version = "13.6.1"; + version = "13.7.1"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "02w7pf7l9sr2nk8ky9b0d5b4syx3d9my65h2kzvh2afk7kv35h5y"; + sha256 = "1zmjll7sdan8kc7bq5vjaiyqwzlh5zmx1g4ql4dqmnwscpn1avjb"; }; - vendorSha256 = "15mx5g2wa93sajbdwh58wcspg0n51d1ciwb7f15d0nm5hspz3w9r"; + vendorSha256 = "15i1ajvrff1bfpv3kmb1wm1mmriswwfw2v4cml0nv0zp6a5n5187"; passthru = { inherit rubyEnv; @@ -39,7 +51,7 @@ in buildGoModule rec { buildFlags = [ "-tags=static,system_libgit2" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; + buildInputs = [ rubyEnv.wrappedRuby libgit openssl zlib pcre http-parser ]; doCheck = false; postInstall = '' diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 9cdadec5d4fb2..fe05c1d017843 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -207,10 +207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12vwx6msqqdyf10zrrp2zdwr8ixrb82phriyin16rsmndb93cijv"; + sha256 = "08lnb04qmlz4arls3nr3ia0k8r1kcyn010fr5qvc2qddidckqk88"; type = "gem"; }; - version = "7.11.0"; + version = "7.12.1"; }; github-markup = { source = { @@ -645,10 +645,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1igl00gk0vaq4xxk44m7yflqdzsblgxlzcxj8saz96bmx7mg7392"; + sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; type = "gem"; }; - version = "3.24.0"; + version = "3.26.0"; }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index e2dd35ff3319b..14f7ce0f81e84 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "13.13.0"; + version = "13.14.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "1zx7x3g18xzw7fs7cayd20llxabv5r93m2mp6ixgr99ksvi6zix7"; + sha256 = "171c4rfffb73198fhlwk8rq7xy4b4zrnssi8c1wd0x82kqv6csb0"; }; buildInputs = [ ruby ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index a0f80533caa04..e536d4fcbb1e3 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "gitlab-workhorse"; - version = "8.54.0"; + version = "8.58.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "0fz00sl9q4d3vbslh7y9nsnhjshgfg0x7mv7b7a9sc3mxmabp7gz"; + sha256 = "1642vxxqnpccjzfls3vz4l62kvksk6irwv1dhjcxv1cppbr9hz80"; }; - vendorSha256 = "0wi6vj9phwh0bsdk2lrgq807nb90iivlm0bkdjkim06jq068mizj"; + vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5"; buildInputs = [ git ]; buildFlagsArray = "-ldflags=-X main.Version=${version}"; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index d60fefe29dca0..49d0841be3cd8 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -66,7 +66,7 @@ gem 'attr_encrypted', '~> 3.1.0' gem 'u2f', '~> 0.2.1' # GitLab Pages -gem 'validates_hostname', '~> 1.0.10' +gem 'validates_hostname', '~> 1.0.11' gem 'rubyzip', '~> 2.0.0', require: 'zip' # GitLab Pages letsencrypt support gem 'acme-client', '~> 2.0', '>= 2.0.6' @@ -115,11 +115,11 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick', '~> 4.10.1' # for backups -gem 'fog-aws', '~> 3.5' +gem 'fog-aws', '~> 3.7' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' -gem 'fog-google', '~> 1.11' +gem 'fog-google', '~> 1.12' gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' @@ -149,7 +149,7 @@ gem 'html-pipeline', '~> 2.12' gem 'deckar01-task_list', '2.3.1' gem 'gitlab-markup', '~> 1.7.1' gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'commonmarker', '~> 0.20' +gem 'commonmarker', '~> 0.21' gem 'kramdown', '~> 2.3.0' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.1.2' @@ -159,7 +159,8 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' -gem 'rouge', '~> 3.25.0' +gem 'asciidoctor-kroki', '~> 0.2.2', require: false +gem 'rouge', '~> 3.26.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' gem 'nokogiri', '~> 1.10.9' @@ -209,7 +210,7 @@ gem 'httparty', '~> 0.16.4' gem 'rainbow', '~> 3.0' # Progress bar -gem 'ruby-progressbar' +gem 'ruby-progressbar', '~> 1.10' # GitLab settings gem 'settingslogic', '~> 2.0.9' @@ -291,7 +292,6 @@ gem 'sassc-rails', '~> 2.1.0' gem 'terser', '1.0.2' gem 'addressable', '~> 2.7' -gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.2' gem 'request_store', '~> 1.5' @@ -311,7 +311,7 @@ gem 'gitlab-pg_query', '~> 1.3', require: 'pg_query' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '0.13.1' +gem 'gitlab-labkit', '0.13.3' # I18n gem 'ruby_parser', '~> 3.15', require: false @@ -351,6 +351,7 @@ group :development do end group :development, :test do + gem 'deprecation_toolkit', '~> 1.5.1', require: false gem 'bullet', '~> 6.1.0' gem 'pry-byebug', '~> 3.9.0', platform: :mri gem 'pry-rails', '~> 0.3.9' @@ -370,7 +371,7 @@ group :development, :test do gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 5.1.0', require: false + gem 'gitlab-styles', '~> 5.3.0', require: false gem 'scss_lint', '~> 0.59.0', require: false gem 'haml_lint', '~> 0.36.0', require: false @@ -428,7 +429,7 @@ end gem 'octokit', '~> 4.15' # https://gitlab.com/gitlab-org/gitlab/issues/207207 -gem 'gitlab-mail_room', '~> 0.0.7', require: 'mail_room' +gem 'gitlab-mail_room', '~> 0.0.8', require: 'mail_room' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' @@ -464,7 +465,7 @@ group :ed25519 do end # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 13.5.0-rc2' +gem 'gitaly', '~> 13.7.0.pre.rc1' gem 'grpc', '~> 1.30.2' @@ -477,6 +478,7 @@ gem 'flipper', '~> 0.17.1' gem 'flipper-active_record', '~> 0.17.1' gem 'flipper-active_support_cache_store', '~> 0.17.1' gem 'unleash', '~> 0.1.5' +gem 'gitlab-experiment', '~> 0.4.4' # Structured logging gem 'lograge', '~> 0.5' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 64179847dd8cf..1cd90080fd878 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -84,6 +84,8 @@ GEM asciidoctor (2.0.10) asciidoctor-include-ext (0.3.1) asciidoctor (>= 1.5.6, < 3.0.0) + asciidoctor-kroki (0.2.2) + asciidoctor (~> 2.0) asciidoctor-plantuml (0.0.12) asciidoctor (>= 1.5.6, < 3.0.0) ast (2.4.1) @@ -177,7 +179,7 @@ GEM open4 (~> 1.3) coderay (1.1.3) colored2 (3.1.2) - commonmarker (0.20.1) + commonmarker (0.21.0) ruby-enum (~> 0.5) concord (0.1.5) adamantium (~> 0.2.0) @@ -220,10 +222,12 @@ GEM debugger-ruby_core_source (1.3.8) deckar01-task_list (2.3.1) html-pipeline - declarative (0.0.10) + declarative (0.0.20) declarative-option (0.1.0) default_value_for (3.3.0) activerecord (>= 3.2.0, < 6.1) + deprecation_toolkit (1.5.1) + activesupport (>= 4.2) derailed_benchmarks (1.7.0) benchmark-ips (~> 2) get_process_mem (~> 0) @@ -359,7 +363,7 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.5.2) + fog-aws (3.7.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -369,11 +373,11 @@ GEM excon (~> 0.58) formatador (~> 0.2) mime-types - fog-google (1.11.0) + fog-google (1.12.0) fog-core (<= 2.1.0) fog-json (~> 1.2) fog-xml (~> 0.1.0) - google-api-client (>= 0.32, < 0.34) + google-api-client (>= 0.44.2, < 0.51) google-cloud-env (~> 1.2) fog-json (1.2.0) fog-core @@ -392,8 +396,6 @@ GEM fog-xml (0.1.3) fog-core nokogiri (>= 1.5.11, < 2.0.0) - font-awesome-rails (4.7.0.5) - railties (>= 3.2, < 6.1) formatador (0.2.5) fugit (1.2.1) et-orbi (~> 1.1, >= 1.1.8) @@ -418,11 +420,14 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (13.5.0.pre.rc2) + gitaly (13.7.0.pre.rc1) grpc (~> 1.0) github-markup (1.7.0) gitlab-chronic (0.10.5) numerizer (~> 0.2) + gitlab-experiment (0.4.4) + activesupport (>= 3.0) + scientist (~> 1.5, >= 1.5.0) gitlab-fog-azure-rm (1.0.0) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) @@ -430,15 +435,16 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.13.1) + gitlab-labkit (0.13.3) actionpack (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 6.1.0) + gitlab-pg_query (~> 1.3) grpc (~> 1.19) jaeger-client (~> 1.1) opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) gitlab-license (1.0.0) - gitlab-mail_room (0.0.7) + gitlab-mail_room (0.0.8) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) gitlab-pg_query (1.3.0) @@ -449,7 +455,7 @@ GEM gitlab-puma (>= 2.7, < 5) gitlab-sidekiq-fetcher (0.5.2) sidekiq (~> 5) - gitlab-styles (5.1.0) + gitlab-styles (5.3.0) rubocop (~> 0.89.1) rubocop-gitlab-security (~> 0.1.0) rubocop-performance (~> 1.8.1) @@ -468,20 +474,21 @@ GEM actionpack (>= 3.0) multi_json request_store (>= 1.0) - google-api-client (0.33.2) + google-api-client (0.50.0) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.9) httpclient (>= 2.8.1, < 3.0) mini_mime (~> 1.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) + rexml signet (~> 0.12) google-cloud-env (1.4.0) faraday (>= 0.17.3, < 2.0) google-protobuf (3.12.4) googleapis-common-protos-types (1.0.5) google-protobuf (~> 3.11) - googleauth (0.12.0) + googleauth (0.14.0) faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -691,7 +698,7 @@ GEM marginalia (1.9.0) actionpack (>= 2.3) activerecord (>= 2.3) - memoist (0.16.0) + memoist (0.16.2) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) memory_profiler (0.9.14) @@ -832,7 +839,7 @@ GEM org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - os (1.0.0) + os (1.1.1) parallel (1.19.2) parser (2.7.2.0) ast (~> 2.4.1) @@ -977,7 +984,7 @@ GEM rexml (3.2.4) rinku (2.0.0) rotp (2.1.2) - rouge (3.25.0) + rouge (3.26.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1041,7 +1048,7 @@ GEM rubocop-rspec (1.44.1) rubocop (~> 0.87) rubocop-ast (>= 0.7.1) - ruby-enum (0.7.2) + ruby-enum (0.8.0) i18n ruby-fogbugz (0.2.1) crack (~> 0.4) @@ -1081,6 +1088,7 @@ GEM sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) + scientist (1.5.0) scss_lint (0.59.0) sass (~> 3.5, >= 3.5.5) securecompare (1.0.0) @@ -1215,7 +1223,7 @@ GEM validate_url (1.0.8) activemodel (>= 3.0.0) public_suffix - validates_hostname (1.0.10) + validates_hostname (1.0.11) activerecord (>= 3.0) activesupport (>= 3.0) version_sorter (2.2.4) @@ -1267,6 +1275,7 @@ DEPENDENCIES asana (= 0.10.2) asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) + asciidoctor-kroki (~> 0.2.2) asciidoctor-plantuml (~> 0.0.12) atlassian-jwt (~> 0.2.0) attr_encrypted (~> 3.1.0) @@ -1292,7 +1301,7 @@ DEPENDENCIES capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) - commonmarker (~> 0.20) + commonmarker (~> 0.21) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) countries (~> 3.0) @@ -1302,6 +1311,7 @@ DEPENDENCIES database_cleaner (~> 1.7.0) deckar01-task_list (= 2.3.1) default_value_for (~> 3.3.0) + deprecation_toolkit (~> 1.5.1) derailed_benchmarks device_detector devise (~> 4.7.2) @@ -1329,33 +1339,33 @@ DEPENDENCIES flipper-active_support_cache_store (~> 0.17.1) flowdock (~> 0.7) fog-aliyun (~> 0.3) - fog-aws (~> 3.5) + fog-aws (~> 3.7) fog-core (= 2.1.0) - fog-google (~> 1.11) + fog-google (~> 1.12) fog-local (~> 0.6) fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) - font-awesome-rails (~> 4.7) fugit (~> 1.2.1) fuubar (~> 2.2.0) gemojione (~> 3.3) gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 13.5.0.pre.rc2) + gitaly (~> 13.7.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) + gitlab-experiment (~> 0.4.4) gitlab-fog-azure-rm (~> 1.0) - gitlab-labkit (= 0.13.1) + gitlab-labkit (= 0.13.3) gitlab-license (~> 1.0) - gitlab-mail_room (~> 0.0.7) + gitlab-mail_room (~> 0.0.8) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) gitlab-pg_query (~> 1.3) gitlab-puma (~> 4.3.3.gitlab.2) gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) gitlab-sidekiq-fetcher (= 0.5.2) - gitlab-styles (~> 5.1.0) + gitlab-styles (~> 5.3.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) @@ -1468,7 +1478,7 @@ DEPENDENCIES request_store (~> 1.5) responders (~> 3.0) retriable (~> 3.1.2) - rouge (~> 3.25.0) + rouge (~> 3.26.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized rspec-rails (~> 4.0.0) @@ -1477,7 +1487,7 @@ DEPENDENCIES rspec_profiling (~> 0.0.6) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 1.3.0) - ruby-progressbar + ruby-progressbar (~> 1.10) ruby_parser (~> 3.15) rubyzip (~> 2.0.0) rugged (~> 0.28) @@ -1515,7 +1525,7 @@ DEPENDENCIES unicorn-worker-killer (~> 0.4.4) unleash (~> 0.1.5) valid_email (~> 0.1) - validates_hostname (~> 1.0.10) + validates_hostname (~> 1.0.11) version_sorter (~> 2.2.4) vmstat (~> 2.3.0) webauthn (~> 2.3) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 651b418234c4f..ebb3fe5b740af 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -258,6 +258,17 @@ }; version = "0.3.1"; }; + asciidoctor-kroki = { + dependencies = ["asciidoctor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10yc07x2z9f122wnncf34s91vlfcd4wy8y9wshxc7j2m4a2jlzm5"; + type = "gem"; + }; + version = "0.2.2"; + }; asciidoctor-plantuml = { dependencies = ["asciidoctor"]; groups = ["default"]; @@ -762,10 +773,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19zd9na1g2d0zzbqhmfj8rjfzcxj34vja3i52gvv859i8fifa461"; + sha256 = "0vwpkmwfr8lx8b6cfvwh56f1ygyf2da5ah37mxbdr9mxmfwig5fr"; type = "gem"; }; - version = "0.20.1"; + version = "0.21.0"; }; concord = { dependencies = ["adamantium" "equalizer"]; @@ -955,10 +966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j"; + sha256 = "1yczgnqrbls7shrg63y88g7wand2yp9h6sf56c9bdcksn5nds8c0"; type = "gem"; }; - version = "0.0.10"; + version = "0.0.20"; }; declarative-option = { groups = ["default"]; @@ -981,6 +992,17 @@ }; version = "3.3.0"; }; + deprecation_toolkit = { + dependencies = ["activesupport"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fh4d98irhph3ri7c2rrvvmmjd4z14702r8baq9flh5f34dap8d8"; + type = "gem"; + }; + version = "1.5.1"; + }; derailed_benchmarks = { dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "mini_histogram" "rack" "rake" "ruby-statistics" "thor" "unicode_plot"]; groups = ["default"]; @@ -1590,10 +1612,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "086kyvdhf1k8nk7f4gmybjc3k0m88f9pw99frddcy1w96pj5kyg4"; + sha256 = "1764kvyzigaxwmxgfggpqq15qpplm77j2nmvhf8f0gybsm3vbrbn"; type = "gem"; }; - version = "3.5.2"; + version = "3.7.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1612,10 +1634,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h9apmm2pyb157pbnrqk37wfs2d9f35navsgzs3kclrxhyl2qm5f"; + sha256 = "1cl6rprichdn1i40c2ndri1c53cfb0x2xk58l9arwip9ivkasln4"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -1672,17 +1694,6 @@ }; version = "0.1.3"; }; - font-awesome-rails = { - dependencies = ["railties"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a32q69rdsdw9zhmf2cflvvnikg20amidhn40sv2afw2qk91fcrz"; - type = "gem"; - }; - version = "4.7.0.5"; - }; formatador = { groups = ["default"]; platforms = []; @@ -1797,10 +1808,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q1l0c1yjnhr451jj845h2vd9s00grjiyj2w9r1b9y3bscsyzs0m"; + sha256 = "1al29diaj9zrkj1rxwrqd644f2winv81dmnjycvm0gsim0vvw2hq"; type = "gem"; }; - version = "13.5.0.pre.rc2"; + version = "13.7.0.pre.rc1"; }; github-markup = { groups = ["default"]; @@ -1823,6 +1834,17 @@ }; version = "0.10.5"; }; + gitlab-experiment = { + dependencies = ["activesupport" "scientist"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12ng0q49vl4k80m3hyx6bz915x1gmfmxjvgzdp3w0q77j4qv6nwi"; + type = "gem"; + }; + version = "0.4.4"; + }; gitlab-fog-azure-rm = { dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; groups = ["default"]; @@ -1835,15 +1857,15 @@ version = "1.0.0"; }; gitlab-labkit = { - dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"]; + dependencies = ["actionpack" "activesupport" "gitlab-pg_query" "grpc" "jaeger-client" "opentracing" "redis"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cnrpqswicawhpvd4dh4jcma9d4haznc4gyl37ssvj1jkfhc4w40"; + sha256 = "0x4d5dl60cfvvqj89b8blpsxa7lbbblqwdqy8kc1z51gira7i803"; type = "gem"; }; - version = "0.13.1"; + version = "0.13.3"; }; gitlab-license = { groups = ["default"]; @@ -1860,10 +1882,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14785l38sqrgf06y45ayhj3nhfqdar8vrsxna764vdsw01dngmin"; + sha256 = "05j8rpsbl2l5q4xnfh2cnws9axy1a19asg8nlw6jngba94raw5ir"; type = "gem"; }; - version = "0.0.7"; + version = "0.0.8"; }; gitlab-markup = { groups = ["default"]; @@ -1934,10 +1956,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l24vgcmvval1apqk99c3ifcwlg1fh60vf02ggnc20f65dka81p3"; + sha256 = "14zg4mxj780ssk6lg8mvy4br3327cdlq17k5sds8zk2glng9vmsh"; type = "gem"; }; - version = "5.1.0"; + version = "5.3.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -1984,15 +2006,15 @@ version = "6.2.0"; }; google-api-client = { - dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"]; + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13y6xara8w211y88pxa8bcbg6y40vkidqk854zl7z4csmgfnplxq"; + sha256 = "05ynbapd26wppcqa81kw6kb8a39mzp0fql1rwmk3lgr95ybmxr1s"; type = "gem"; }; - version = "0.33.2"; + version = "0.50.0"; }; google-cloud-env = { dependencies = ["faraday"]; @@ -2032,10 +2054,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rsk471ld98pxhvzig3lnw9i13454c9nschvzxvq6vjqnn9ip0yh"; + sha256 = "0cm60nbmwzf83fzy06f3iyn5a6sw91siw8x9bdvpwwmjsmivana6"; type = "gem"; }; - version = "0.12.0"; + version = "0.14.0"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -2854,10 +2876,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh"; + sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55"; type = "gem"; }; - version = "0.16.0"; + version = "0.16.2"; }; memoizable = { dependencies = ["thread_safe"]; @@ -3562,10 +3584,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk"; + sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.1"; }; parallel = { groups = ["development" "test"]; @@ -4250,10 +4272,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yvcv901lrh5rfnk1h4h56hf2m6n9pd6w8n96vag74aakgz3gaxn"; + sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; type = "gem"; }; - version = "3.25.0"; + version = "3.26.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -4458,10 +4480,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx"; + sha256 = "0d3dyx2z41zd6va9dwn3q8caf710vzdaf57xspc0y17aqmnprwnw"; type = "gem"; }; - version = "0.7.2"; + version = "0.8.0"; }; ruby-fogbugz = { dependencies = ["crack"]; @@ -4663,6 +4685,16 @@ }; version = "0.8.2"; }; + scientist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09565ppvd851zxpspn5d5q28wqkfjyfxhvda9w80i16p3y937155"; + type = "gem"; + }; + version = "1.5.0"; + }; scss_lint = { dependencies = ["sass"]; groups = ["development" "test"]; @@ -5374,10 +5406,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "066hkh3ihzhrp5a9knjgqqfi5dyv4z5hfrpdj4fpgxjkvkfaxivy"; + sha256 = "1hxqza44pvk6x6vb91cvllhw71hqziby06dk1s94rh9f6khbl1nm"; type = "gem"; }; - version = "1.0.10"; + version = "1.0.11"; }; version_sorter = { groups = ["default"]; diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 0f215370e184d..f662bd3097f95 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log vgo2nix yarn2nix +#! nix-shell -i python3 -p bundix bundler nix-update nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log yarn2nix import click import click_log @@ -83,10 +83,10 @@ def _get_data_json(): return json.load(f) -def _call_update_source_version(pkg, version): - """calls update-source-version from nixpkgs root dir""" +def _call_nix_update(pkg, version): + """calls nix-update from nixpkgs root dir""" nixpkgs_path = pathlib.Path(__file__).parent / '../../../../' - return subprocess.check_output(['update-source-version', pkg, version], cwd=nixpkgs_path) + return subprocess.check_output(['nix-update', pkg, '--version', version], cwd=nixpkgs_path) @click_log.simple_verbosity_option(logger) @@ -168,20 +168,10 @@ def update_gitaly(): with open(gitaly_dir / fn, 'w') as f: f.write(repo.get_file(f"ruby/{fn}", f"v{gitaly_server_version}")) - for fn in ['go.mod', 'go.sum']: - with open(gitaly_dir / fn, 'w') as f: - f.write(repo.get_file(fn, f"v{gitaly_server_version}")) - subprocess.check_output(['bundle', 'lock'], cwd=gitaly_dir) subprocess.check_output(['bundix'], cwd=gitaly_dir) - os.environ['GOROOT'] = "" - subprocess.check_output(['vgo2nix', '--keep-going'], cwd=gitaly_dir) - - for fn in ['go.mod', 'go.sum']: - os.unlink(gitaly_dir / fn) - - _call_update_source_version('gitaly', gitaly_server_version) + _call_nix_update('gitaly', gitaly_server_version) @cli.command('update-gitlab-shell') @@ -189,42 +179,22 @@ def update_gitlab_shell(): """Update gitlab-shell""" data = _get_data_json() gitlab_shell_version = data['passthru']['GITLAB_SHELL_VERSION'] - _call_update_source_version('gitlab-shell', gitlab_shell_version) + _call_nix_update('gitlab-shell', gitlab_shell_version) repo = GitLabRepo(repo='gitlab-shell') gitlab_shell_dir = pathlib.Path(__file__).parent / 'gitlab-shell' - for fn in ['go.mod', 'go.sum']: - with open(gitlab_shell_dir / fn, 'w') as f: - f.write(repo.get_file(fn, f"v{gitlab_shell_version}")) - - os.environ['GOROOT'] = "" - subprocess.check_output(['vgo2nix', '--keep-going'], cwd=gitlab_shell_dir) - - for fn in ['go.mod', 'go.sum']: - os.unlink(gitlab_shell_dir / fn) - @cli.command('update-gitlab-workhorse') def update_gitlab_workhorse(): """Update gitlab-workhorse""" data = _get_data_json() gitlab_workhorse_version = data['passthru']['GITLAB_WORKHORSE_VERSION'] - _call_update_source_version('gitlab-workhorse', gitlab_workhorse_version) + _call_nix_update('gitlab-workhorse', gitlab_workhorse_version) repo = GitLabRepo('gitlab-org', 'gitlab-workhorse') gitlab_workhorse_dir = pathlib.Path(__file__).parent / 'gitlab-workhorse' - for fn in ['go.mod', 'go.sum']: - with open(gitlab_workhorse_dir / fn, 'w') as f: - f.write(repo.get_file(fn, f"v{gitlab_workhorse_version}")) - - os.environ['GOROOT'] = "" - subprocess.check_output(['vgo2nix', '--keep-going'], cwd=gitlab_workhorse_dir) - - for fn in ['go.mod', 'go.sum']: - os.unlink(gitlab_workhorse_dir / fn) - @cli.command('update-all') @click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'') @click.pass_context diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index ca504fc231e9d..ba24888d9522b 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -786,19 +786,27 @@ }; } { - name = "_gitlab_svgs___svgs_1.175.0.tgz"; + name = "_gitlab_svgs___svgs_1.177.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.175.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.175.0.tgz"; - sha1 = "734f341784af1cd1d62d160a17bcdfb61ff7b04d"; + name = "_gitlab_svgs___svgs_1.177.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.177.0.tgz"; + sha1 = "e481ed327a11d3834c8b1668d7485b9eefef97f5"; }; } { - name = "_gitlab_ui___ui_23.9.0.tgz"; + name = "_gitlab_tributejs___tributejs_1.0.0.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_23.9.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-23.9.0.tgz"; - sha1 = "e21966130b41e624dbe4505911a79afb731c2d6b"; + name = "_gitlab_tributejs___tributejs_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz"; + sha1 = "672befa222aeffc83e7d799b0500a7a4418e59b8"; + }; + } + { + name = "_gitlab_ui___ui_24.8.1.tgz"; + path = fetchurl { + name = "_gitlab_ui___ui_24.8.1.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-24.8.1.tgz"; + sha1 = "eb674d19aedf9c91b9a14aa7a66397d54b199fb7"; }; } { @@ -1026,19 +1034,19 @@ }; } { - name = "_toast_ui_editor___editor_2.5.0.tgz"; + name = "_toast_ui_editor___editor_2.5.1.tgz"; path = fetchurl { - name = "_toast_ui_editor___editor_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.0.tgz"; - sha1 = "02779b119eaa6dd7601249d75ca031e0b98400f1"; + name = "_toast_ui_editor___editor_2.5.1.tgz"; + url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.1.tgz"; + sha1 = "42671c52ca4b97c84f684d09c2966711b36f41a7"; }; } { - name = "_toast_ui_vue_editor___vue_editor_2.5.0.tgz"; + name = "_toast_ui_vue_editor___vue_editor_2.5.1.tgz"; path = fetchurl { - name = "_toast_ui_vue_editor___vue_editor_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.0.tgz"; - sha1 = "8094136588b0f726241b5f89d0754a7169f2ffee"; + name = "_toast_ui_vue_editor___vue_editor_2.5.1.tgz"; + url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.1.tgz"; + sha1 = "0a221d74d5305c8ca20cb11d9eb8ff9206455cfc"; }; } { @@ -4394,11 +4402,11 @@ }; } { - name = "dompurify___dompurify_2.2.2.tgz"; + name = "dompurify___dompurify_2.2.4.tgz"; path = fetchurl { - name = "dompurify___dompurify_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.2.tgz"; - sha1 = "cb8c2b1a2f3c8a0b565127504ae4eedec176a972"; + name = "dompurify___dompurify_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.4.tgz"; + sha1 = "a98cd182b729bdd8715c3eb7a8bf8eafb2ff7410"; }; } { @@ -7434,6 +7442,14 @@ }; } { + name = "jest_raw_loader___jest_raw_loader_1.0.1.tgz"; + path = fetchurl { + name = "jest_raw_loader___jest_raw_loader_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/jest-raw-loader/-/jest-raw-loader-1.0.1.tgz"; + sha1 = "ce9f56d54650f157c4a7d16d224ba5d613bcd626"; + }; + } + { name = "jest_regex_util___jest_regex_util_26.0.0.tgz"; path = fetchurl { name = "jest_regex_util___jest_regex_util_26.0.0.tgz"; @@ -8938,11 +8954,11 @@ }; } { - name = "mock_apollo_client___mock_apollo_client_0.4.0.tgz"; + name = "mock_apollo_client___mock_apollo_client_0.5.0.tgz"; path = fetchurl { - name = "mock_apollo_client___mock_apollo_client_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-0.4.0.tgz"; - sha1 = "556a6090b1816dbf07e51093b652aca84aee979e"; + name = "mock_apollo_client___mock_apollo_client_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-0.5.0.tgz"; + sha1 = "8f0d6a1ba0d349ebde87a1dcd85c7fd353076922"; }; } { @@ -12658,14 +12674,6 @@ }; } { - name = "tributejs___tributejs_5.1.3.tgz"; - path = fetchurl { - name = "tributejs___tributejs_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/tributejs/-/tributejs-5.1.3.tgz"; - sha1 = "980600fc72865be5868893078b4bfde721129eae"; - }; - } - { name = "trim_newlines___trim_newlines_1.0.0.tgz"; path = fetchurl { name = "trim_newlines___trim_newlines_1.0.0.tgz"; @@ -13466,19 +13474,19 @@ }; } { - name = "vue_loader___vue_loader_15.9.3.tgz"; + name = "vue_loader___vue_loader_15.9.5.tgz"; path = fetchurl { - name = "vue_loader___vue_loader_15.9.3.tgz"; - url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.3.tgz"; - sha1 = "0de35d9e555d3ed53969516cac5ce25531299dda"; + name = "vue_loader___vue_loader_15.9.5.tgz"; + url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.5.tgz"; + sha1 = "7a960dc420a3439deaacdda038fdcdbf7c432706"; }; } { - name = "vue_router___vue_router_3.4.5.tgz"; + name = "vue_router___vue_router_3.4.9.tgz"; path = fetchurl { - name = "vue_router___vue_router_3.4.5.tgz"; - url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.5.tgz"; - sha1 = "d396ec037b35931bdd1e9b7edd86f9788dc15175"; + name = "vue_router___vue_router_3.4.9.tgz"; + url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.9.tgz"; + sha1 = "c016f42030ae2932f14e4748b39a1d9a0e250e66"; }; } { @@ -13538,11 +13546,11 @@ }; } { - name = "vuex___vuex_3.5.1.tgz"; + name = "vuex___vuex_3.6.0.tgz"; path = fetchurl { - name = "vuex___vuex_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/vuex/-/vuex-3.5.1.tgz"; - sha1 = "f1b8dcea649bc25254cf4f4358081dbf5da18b3d"; + name = "vuex___vuex_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/vuex/-/vuex-3.6.0.tgz"; + sha1 = "95efa56a58f7607c135b053350833a09e01aa813"; }; } { diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index b09267fb9395c..1439f79224892 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.21"; + version = "1.0.0-alpha.24"; src = fetchCrate { inherit version pname; - sha256 = "0csa2a8ci6b9vgq57hyz2ng0x8pv1p1ilw72z2b8rrpacdrzb633"; + sha256 = "1h1vgx0zlymnhalqsgmp9gv6sxbizmyryldx5vzl6djl23dvzd6s"; }; - cargoSha256 = "05z5iqs63s6cvaq4sjfxhcg5ka3rwn6ikcjs26jyqcbkp2bd9z88"; + cargoSha256 = "1yx7qqfyabhrf6mcca4frdcp9a426khp90nznhshhm71liqr9y44"; cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index defbf9c2aec46..4279fdd5f995c 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bundlerEnv, ruby }: +{ stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }: let version = "4.1.1"; @@ -19,6 +19,7 @@ in sha256 = "1nndy5hz8zvfglxf1f3bsb1pkrfwinfxzkdan1vjs3rkckkszyh5"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; # taken from https://www.redmine.org/issues/33784 @@ -31,12 +32,14 @@ in ''; installPhase = '' - mkdir -p $out/share + mkdir -p $out/bin $out/share cp -r . $out/share/redmine for i in config files log plugins public/plugin_assets public/themes tmp; do rm -rf $out/share/redmine/$i ln -fs /run/redmine/$i $out/share/redmine/$i done + + makeWrapper ${rubyEnv.wrappedRuby}/bin/ruby $out/bin/rdm-mailhandler.rb --add-flags $out/share/redmine/extra/mail_handler/rdm-mailhandler.rb ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 6863ef9ca6226..12c16a744b08e 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -467,7 +467,7 @@ let self = rec { propagatedBuildInputs = [ simpleplugin python2Packages.requests - python2Packages.libtorrentRasterbar + python2Packages.libtorrent-rasterbar ]; meta = { diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index d6cbc25d883b2..79e32007144fc 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "0.20"; + version = "0.21"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "15ihffwhpjnzgz0ir5vc9la4fwkqj91vmrcsb2r58ikq7h9sk45j"; + sha256 = "Y/tH6Znq//HBA/FHfIm2Wpppx6TiL7CqKtZFDc/XSNc="; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index d2f1f2debe545..e143ebcca7557 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -9,20 +9,25 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.21"; + version = "2.0.22"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "13g436s00bcwzs31qsx5rpgkbbyxd4zvx8mbkq10gkrsv4r04q23"; + sha256 = "07wd3pns6x25dcnc1r84cwmrzg8xgzsfmidkclcpcagf97ad7jmc"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib systemd ] ++ stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; - installFlags = [ "PREFIX=$(out)" ]; + # manpage requires building the vendored go-md2man + makeFlags = [ "bin/conmon" ]; + + installPhase = '' + install -D bin/conmon -t $out/bin + ''; passthru.tests = { inherit (nixosTests) cri-o podman; }; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index cece3cc6b6737..695109fd8a403 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -1,12 +1,16 @@ -{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, util-linux, nixosTests }: - -with lib; +{ lib +, fetchFromGitHub +, buildGoPackage +, btrfs-progs +, go-md2man +, installShellFiles +, util-linux +, nixosTests +}: buildGoPackage rec { pname = "containerd"; version = "1.4.3"; - # git commit for the above version's tag - commit = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; src = fetchFromGitHub { owner = "containerd"; @@ -22,29 +26,32 @@ buildGoPackage rec { buildInputs = [ btrfs-progs ]; - buildFlags = [ "VERSION=v${version}" "REVISION=${commit}" ]; + buildFlags = [ "VERSION=v${version}" "REVISION=${src.rev}" ]; - BUILDTAGS = [] - ++ optional (btrfs-progs == null) "no_btrfs"; + BUILDTAGS = [ ] + ++ lib.optional (btrfs-progs == null) "no_btrfs"; buildPhase = '' cd go/src/${goPackagePath} patchShebangs . - make binaries $buildFlags + make binaries man $buildFlags ''; installPhase = '' - for b in bin/*; do - install -Dm555 $b $out/$b - done - - make man + install -Dm555 bin/* -t $out/bin installManPage man/*.[1-9] ''; + # completion installed separately so it can be overridden in docker + # can be moved to installPhase when docker uses containerd >= 1.4 + postInstall = '' + installShellFiles --bash contrib/autocomplete/ctr + installShellFiles --zsh --name _ctr contrib/autocomplete/zsh_autocomplete + ''; + passthru.tests = { inherit (nixosTests) docker; }; - meta = { + meta = with lib; { homepage = "https://containerd.io/"; description = "A daemon to control runC"; license = licenses.asl20; diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 84e0135f665b5..9ba7ff5d66bc3 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.32.0"; + version = "1.33.0"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "0pd2v7df176ca923c4nw9ns5gz442jkb0jhzqjl53rwfwz1vxy9h"; + sha256 = "0fk1r9id3fjcqdg4nls2k5ik3822njz4xx9fpbvmx0fycvjmbr4v"; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; @@ -39,6 +39,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Minify and secure Docker containers"; homepage = "https://dockersl.im/"; + changelog = "https://github.com/docker-slim/docker-slim/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ Br1ght0ne marsam mbrgm ]; }; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 1d55744efb49c..1f4d5e3aac64a 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -41,6 +41,8 @@ rec { rev = containerdRev; sha256 = containerdSha256; }; + # disable completion, can be removed when docker uses containerd >= 1.4 + postInstall = []; # This should be removed once Docker uses containerd >=1.4 nativeBuildInputs = oldAttrs.nativeBuildInputs ++ lib.optional withlibseccomp pkgconfig; buildInputs = oldAttrs.buildInputs ++ lib.optional withlibseccomp libseccomp; diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix index 464fe46b499c8..ce08428eba0a1 100644 --- a/pkgs/applications/virtualization/vpcs/default.nix +++ b/pkgs/applications/virtualization/vpcs/default.nix @@ -1,19 +1,16 @@ -{ stdenv, fetchurl, glibc }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "vpcs"; - version = "0.8"; + version = "0.8.1"; - src = fetchurl { - name = "${pname}-${version}.tar.bz2"; - url = "mirror://sourceforge/project/${pname}/${version}/${pname}-${version}-src.tbz"; - sha256 = "14y9nflcyq486vvw0na0fkfmg5dac004qb332v4m5a0vaz8059nw"; + src = fetchFromGitHub { + owner = "GNS3"; + repo = pname; + rev = "v${version}"; + sha256 = "0kqy4bd3ns8nzn7fa72izn7a08sfrasy1rn7fd8ajah2wv8d2cak"; }; - patches = [ ./vpcs-0.8-glibc-2.26.patch ]; - - buildInputs = [ glibc.static ]; - buildPhase = ''( cd src ./mk.sh ${stdenv.buildPlatform.platform.kernelArch} @@ -27,13 +24,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "Virtual PC simulator"; + description = "A simple virtual PC simulator"; longDescription = '' - The VPCS can simulate up to 9 PCs. You can ping/traceroute them, or - ping/traceroute the other hosts/routers from the VPCS when you study the - Cisco routers in the dynamips. + The VPCS (Virtual PC Simulator) can simulate up to 9 PCs. You can + ping/traceroute them, or ping/traceroute the other hosts/routers from the + VPCS when you study the Cisco routers in the dynamips. ''; - homepage = "https://sourceforge.net/projects/vpcs/"; + inherit (src.meta) homepage; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/applications/virtualization/vpcs/vpcs-0.8-glibc-2.26.patch b/pkgs/applications/virtualization/vpcs/vpcs-0.8-glibc-2.26.patch deleted file mode 100644 index d94a39ccd64da..0000000000000 --- a/pkgs/applications/virtualization/vpcs/vpcs-0.8-glibc-2.26.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/getopt.h b/src/getopt.h -index 4394aa2..bf59e10 100644 ---- a/src/getopt.h -+++ b/src/getopt.h -@@ -49,9 +49,6 @@ extern int optind; - extern int opterr; - extern int optopt; - --#ifndef FreeBSD --int getopt(int argc, char** argv, char* optstr); --#endif - int arg_to_int(const char* arg, int min, int max, int defalt); - - #ifdef __cplusplus diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 755ceb42161ca..10f86132ea9ad 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -20,7 +20,7 @@ i3.overrideAttrs (oldAttrs : rec { homepage = "https://github.com/Airblader/i3"; maintainers = with maintainers; [ fmthoma ]; license = licenses.bsd3; - platforms = platforms.all; + platforms = platforms.linux ++ platforms.netbsd ++ platforms.openbsd; longDescription = '' Fork of i3wm, a tiling window manager primarily targeted at advanced users diff --git a/pkgs/applications/window-managers/i3/i3-resurrect.nix b/pkgs/applications/window-managers/i3/i3-resurrect.nix new file mode 100644 index 0000000000000..a765d2e298ed2 --- /dev/null +++ b/pkgs/applications/window-managers/i3/i3-resurrect.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonApplication, click, i3ipc, psutil, natsort, fetchPypi, xprop, xdotool, importlib-metadata }: + +buildPythonApplication rec { + pname = "i3-resurrect"; + version = "1.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0h181frdwpqfj9agw43qgicdvzv1i7xwky0vs0ksd8h18qxqp4hr"; + }; + + propagatedBuildInputs = [ click psutil xprop natsort i3ipc xdotool importlib-metadata ]; + doCheck = false; # no tests + + meta = with lib; { + homepage = "https://github.com/JonnyHaystack/i3-resurrect"; + description = "A simple but flexible solution to saving and restoring i3 workspaces"; + license = licenses.gpl3; + platforms= platforms.linux; + maintainers = with maintainers; [ magnetophon ]; + }; +} diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index a64e5ea33693e..f07a1926f6e4c 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -55,8 +55,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ malyn ]; license = licenses.bsd3; - # Needs the SSE2 instruction set. See upstream issue - # https://github.com/chrjguill/i3lock-color/issues/44 - platforms = platforms.x86; + platforms = platforms.all; }; } diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index 494bb9ff1b711..a00462e81113b 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "notion"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "raboof"; repo = pname; rev = version; - sha256 = "1s0fyacygvc9iz7b9v3b2cmzzqc02nh4g1p9bfcxbg254iscd502"; + sha256 = "14swd0yqci8lxn259fkd9w92bgyf4rmjwgvgyqp78wlfix6ai4mv"; }; nativeBuildInputs = [ pkgconfig makeWrapper groff ]; diff --git a/pkgs/applications/window-managers/wayfire/applications.nix b/pkgs/applications/window-managers/wayfire/applications.nix new file mode 100644 index 0000000000000..6c22227c0c513 --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/applications.nix @@ -0,0 +1,23 @@ +{ newScope, wayfirePlugins }: + +let + self = with self; { + inherit wayfirePlugins; + + callPackage = newScope self; + + wayfire = callPackage ./. { }; + + wcm = callPackage ./wcm.nix { + inherit (wayfirePlugins) wf-shell; + }; + + wrapWayfireApplication = callPackage ./wrapper.nix { }; + + withPlugins = selector: self // { + wayfire = wrapWayfireApplication wayfire selector; + wcm = wrapWayfireApplication wcm selector; + }; + }; +in +self diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix new file mode 100644 index 0000000000000..513784b8b52b0 --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, git +, cairo, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland +, wayland-protocols, wf-config, wlroots +}: + +stdenv.mkDerivation rec { + pname = "wayfire"; + version = "0.6.0"; + + src = fetchurl { + url = "https://github.com/WayfireWM/wayfire/releases/download/${version}/wayfire-${version}.tar.xz"; + sha256 = "0wc5szslgf8d4r4dlbfgc5v49j2ziaa8fycmknq4p0vl67mh7acq"; + }; + + nativeBuildInputs = [ meson ninja pkg-config wayland ]; + buildInputs = [ + cairo libdrm libexecinfo libinput libjpeg libxkbcommon wayland + wayland-protocols wf-config wlroots + ]; + + mesonFlags = [ "--sysconfdir" "/etc" ]; + + meta = with lib; { + homepage = "https://wayfire.org/"; + description = "3D wayland compositor"; + license = licenses.mit; + maintainers = with maintainers; [ qyliss wucke13 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/window-managers/wayfire/plugins.nix b/pkgs/applications/window-managers/wayfire/plugins.nix new file mode 100644 index 0000000000000..830a918fcb7e4 --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/plugins.nix @@ -0,0 +1,12 @@ +{ newScope, wayfire }: + +let + self = with self; { + inherit wayfire; + + callPackage = newScope self; + + wf-shell = callPackage ./wf-shell.nix { }; + }; +in +self diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix new file mode 100644 index 0000000000000..7c4b546c68efc --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, wayland, wrapGAppsHook +, gnome3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell +}: + +stdenv.mkDerivation rec { + pname = "wcm"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "WayfireWM"; + repo = "wcm"; + rev = "v${version}"; + sha256 = "1b22gymqfn0c49nf39676q5bj25rxab874iayiq31cmn14r30dyg"; + }; + + nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ]; + buildInputs = [ + gnome3.gtk libevdev libxml2 wayfire wayland + wayland-protocols wf-config wf-shell + ]; + + meta = with lib; { + homepage = "https://github.com/WayfireWM/wcm"; + description = "Wayfire Config Manager"; + license = licenses.mit; + maintainers = with maintainers; [ qyliss wucke13 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix new file mode 100644 index 0000000000000..00a4404c1d4e5 --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, glm, libevdev, libxml2 }: + +stdenv.mkDerivation rec { + pname = "wf-config"; + version = "0.6.0"; + + src = fetchurl { + url = "https://github.com/WayfireWM/wf-config/releases/download/${version}/wf-config-${version}.tar.xz"; + sha256 = "1a5aqybhbp9dp4jygrm3gbkdap5qbd52y6ihfr4rm1cj37sckcn0"; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ libevdev libxml2 ]; + propagatedBuildInputs = [ glm ]; + + meta = with lib; { + homepage = "https://github.com/WayfireWM/wf-config"; + description = "Library for managing configuration files, written for Wayfire"; + license = licenses.mit; + maintainers = with maintainers; [ qyliss wucke13 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix new file mode 100644 index 0000000000000..6e5f189275b63 --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, git +, alsaLib, gnome3, gtk-layer-shell, pulseaudio, wayfire, wf-config +}: + +stdenv.mkDerivation rec { + pname = "wf-shell"; + version = "0.6.1"; + + # > Note to packagers: do not use the autogenerated "Source code" + # > archives from GitHub, but the wf-shell-0.4.0.tar.xz file. + src = fetchurl { + url = "https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz"; + sha256 = "0jl8gj185k2ff754lcj5b5nldhkvrhmlaj8lsik4kx78vlb5m3ns"; + }; + + nativeBuildInputs = [ meson ninja pkg-config wayland ]; + buildInputs = [ + alsaLib gnome3.gtkmm gtk-layer-shell pulseaudio wayfire wf-config + ]; + + mesonFlags = [ "--sysconfdir" "/etc" ]; + + meta = with lib; { + homepage = "https://github.com/WayfireWM/wf-shell"; + description = "GTK3-based panel for Wayfire"; + license = licenses.mit; + maintainers = with maintainers; [ qyliss wucke13 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/window-managers/wayfire/wrapper.nix b/pkgs/applications/window-managers/wayfire/wrapper.nix new file mode 100644 index 0000000000000..6229289854711 --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/wrapper.nix @@ -0,0 +1,39 @@ +{ runCommandNoCC, lib, makeWrapper, wayfirePlugins }: + +let + inherit (lib) escapeShellArg makeBinPath; + + xmlPath = plugin: "${plugin}/share/wayfire/metadata/wf-shell"; + + makePluginPath = lib.makeLibraryPath; + makePluginXMLPath = lib.concatMapStringsSep ":" xmlPath; +in + +application: + +choosePlugins: + +let + plugins = choosePlugins wayfirePlugins; +in + +runCommandNoCC "${application.name}-wrapped" { + nativeBuildInputs = [ makeWrapper ]; + + passthru = application.passthru // { + unwrapped = application; + }; + + inherit (application) meta; +} '' + mkdir -p $out/bin + for bin in ${application}/bin/* + do + makeWrapper "$bin" $out/bin/''${bin##*/} \ + --suffix PATH : ${escapeShellArg (makeBinPath plugins)} \ + --suffix WAYFIRE_PLUGIN_PATH : ${escapeShellArg (makePluginPath plugins)} \ + --suffix WAYFIRE_PLUGIN_XML_PATH : ${escapeShellArg (makePluginXMLPath plugins)} + done + find ${application} -mindepth 1 -maxdepth 1 -not -name bin \ + -exec ln -s '{}' $out ';' +'' diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 09cef8b8678d1..0855c27eff49a 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -76,10 +76,14 @@ let cannonlake = versionAtLeast ccVersion "8.0"; icelake-client = versionAtLeast ccVersion "8.0"; icelake-server = versionAtLeast ccVersion "8.0"; + cascadelake = versionAtLeast ccVersion "9.0"; + cooperlake = versionAtLeast ccVersion "10.0"; + tigerlake = versionAtLeast ccVersion "10.0"; knm = versionAtLeast ccVersion "8.0"; # AMD znver1 = versionAtLeast ccVersion "6.0"; znver2 = versionAtLeast ccVersion "9.0"; + znver3 = versionAtLeast ccVersion "11.0"; }.${arch} or true else if isClang then { # Intel @@ -437,7 +441,7 @@ stdenv.mkDerivation { '' + optionalString targetPlatform.isNetBSD '' hardening_unsupported_flags+=" stackprotector fortify" '' + optionalString cc.langAda or false '' - hardening_unsupported_flags+=" stackprotector strictoverflow" + hardening_unsupported_flags+=" format stackprotector strictoverflow" '' + optionalString cc.langD or false '' hardening_unsupported_flags+=" format" '' + optionalString targetPlatform.isWasm '' diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix index 956787ad59e4e..588699517bafc 100644 --- a/pkgs/build-support/emacs/generic.nix +++ b/pkgs/build-support/emacs/generic.nix @@ -60,10 +60,13 @@ stdenv.mkDerivation ({ LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; + addEmacsNativeLoadPath = true; + postInstall = '' - find $out/share/emacs -type f -name '*.el' -print0 | xargs -0 -n 1 -I {} -P $NIX_BUILD_CORES sh -c "emacs --batch -f batch-native-compile {} || true" + find $out/share/emacs -type f -name '*.el' -print0 \ + | xargs -0 -n 1 -I {} -P $NIX_BUILD_CORES sh -c \ + "emacs --batch --eval=\"(add-to-list 'comp-eln-load-path \\\"$out/share/emacs/native-lisp/\\\")\" -f batch-native-compile {} || true" ''; - } // removeAttrs args [ "buildInputs" "packageRequires" diff --git a/pkgs/build-support/emacs/setup-hook.sh b/pkgs/build-support/emacs/setup-hook.sh index 83e995631b3e6..f6f2331b8e023 100644 --- a/pkgs/build-support/emacs/setup-hook.sh +++ b/pkgs/build-support/emacs/setup-hook.sh @@ -7,9 +7,20 @@ addToEmacsLoadPath() { fi } +addToEmacsNativeLoadPath() { + local nativeDir="$1" + if [[ -d $nativeDir && ${EMACSNATIVELOADPATH-} != *"$nativeDir":* ]]; then + export EMACSNATIVELOADPATH="$nativeDir:${EMACSNATIVELOADPATH-}" + fi +} + addEmacsVars () { addToEmacsLoadPath "$1/share/emacs/site-lisp" + if [ -n "${addEmacsNativeLoadPath:-}" ]; then + addToEmacsNativeLoadPath "$1/share/emacs/native-lisp" + fi + # Add sub paths to the Emacs load path if it is a directory # containing .el files. This is necessary to build some packages, # e.g., using trivialBuild. diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 0afd0f831fe27..a3136839122d5 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -34,7 +34,15 @@ in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ]) { lib, lndir, makeWrapper, runCommand }: self: -with lib; let inherit (self) emacs; in +with lib; + +let + + inherit (self) emacs; + + nativeComp = emacs.nativeComp or false; + +in packagesFun: # packages explicitly requested by the user @@ -95,6 +103,9 @@ runCommand } mkdir -p $out/bin mkdir -p $out/share/emacs/site-lisp + ${optionalString nativeComp '' + mkdir -p $out/share/emacs/native-lisp + ''} local requires for pkg in $explicitRequires; do @@ -116,6 +127,9 @@ runCommand linkEmacsPackage() { linkPath "$1" "bin" "bin" linkPath "$1" "share/emacs/site-lisp" "share/emacs/site-lisp" + ${optionalString nativeComp '' + linkPath "$1" "share/emacs/native-lisp" "share/emacs/native-lisp" + ''} } # Iterate over the array of inputs (avoiding nix's own interpolation) @@ -138,12 +152,21 @@ runCommand (load-file "$emacs/share/emacs/site-lisp/site-start.el") (add-to-list 'load-path "$out/share/emacs/site-lisp") (add-to-list 'exec-path "$out/bin") + ${optionalString nativeComp '' + (add-to-list 'comp-eln-load-path "$out/share/emacs/native-lisp/") + ''} EOF # Link subdirs.el from the emacs distribution ln -s $emacs/share/emacs/site-lisp/subdirs.el -T $subdirs # Byte-compiling improves start-up time only slightly, but costs nothing. $emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs" + + ${optionalString nativeComp '' + $emacs/bin/emacs --batch \ + --eval "(add-to-list 'comp-eln-load-path \"$out/share/emacs/native-lisp/\")" \ + -f batch-native-compile "$siteStart" "$subdirs" + ''} ''; inherit (emacs) meta; @@ -159,6 +182,7 @@ runCommand substitute ${./wrapper.sh} $out/bin/$progname \ --subst-var-by bash ${emacs.stdenv.shell} \ --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ + --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp:" \ --subst-var prog chmod +x $out/bin/$progname done @@ -173,11 +197,16 @@ runCommand $emacs/Applications/Emacs.app/Contents/Resources \ $out/Applications/Emacs.app/Contents + substitute ${./wrapper.sh} $out/Applications/Emacs.app/Contents/MacOS/Emacs \ --subst-var-by bash ${emacs.stdenv.shell} \ --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ --subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs" chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs + + makeWrapper $emacs/Applications/Emacs.app/Contents/MacOS/Emacs $out/Applications/Emacs.app/Contents/MacOS/Emacs \ + --suffix EMACSLOADPATH ":" "$deps/share/emacs/site-lisp:" \ + --suffix EMACSNATIVELOADPATH ":" "$deps/share/emacs/native-lisp:" fi mkdir -p $out/share diff --git a/pkgs/build-support/emacs/wrapper.sh b/pkgs/build-support/emacs/wrapper.sh index 96c9a8a60ea40..e8eecb8c86966 100644 --- a/pkgs/build-support/emacs/wrapper.sh +++ b/pkgs/build-support/emacs/wrapper.sh @@ -3,6 +3,7 @@ IFS=: newLoadPath=() +newNativeLoadPath=() added= if [[ -n $EMACSLOADPATH ]] @@ -21,7 +22,26 @@ else newLoadPath+=("") fi +if [[ -n $EMACSNATIVELOADPATH ]] +then + while read -rd: entry + do + if [[ -z $entry && -z $added ]] + then + newNativeLoadPath+=(@wrapperSiteLispNative@) + added=1 + fi + newNativeLoadPath+=("$entry") + done <<< "$EMACSNATIVELOADPATH:" +else + newNativeLoadPath+=(@wrapperSiteLispNative@) + newNativeLoadPath+=("") +fi + export EMACSLOADPATH="${newLoadPath[*]}" export emacsWithPackages_siteLisp=@wrapperSiteLisp@ +export EMACSNATIVELOADPATH="${newNativeLoadPath[*]}" +export emacsWithPackages_siteLispNative=@wrapperSiteLispNative@ + exec @prog@ "$@" diff --git a/pkgs/build-support/kernel/initrd-compressor-meta.nix b/pkgs/build-support/kernel/initrd-compressor-meta.nix new file mode 100644 index 0000000000000..443e599a239e5 --- /dev/null +++ b/pkgs/build-support/kernel/initrd-compressor-meta.nix @@ -0,0 +1,53 @@ +rec { + cat = { + executable = pkgs: "cat"; + ubootName = "none"; + extension = ".cpio"; + }; + gzip = { + executable = pkgs: "${pkgs.gzip}/bin/gzip"; + defaultArgs = ["-9n"]; + ubootName = "gzip"; + extension = ".gz"; + }; + bzip2 = { + executable = pkgs: "${pkgs.bzip2}/bin/bzip2"; + ubootName = "bzip2"; + extension = ".bz2"; + }; + xz = { + executable = pkgs: "${pkgs.xz}/bin/xz"; + defaultArgs = ["--check=crc32" "--lzma2=dict=512KiB"]; + extension = ".xz"; + }; + lzma = { + executable = pkgs: "${pkgs.xz}/bin/lzma"; + defaultArgs = ["--check=crc32" "--lzma1=dict=512KiB"]; + ubootName = "lzma"; + extension = ".lzma"; + }; + lz4 = { + executable = pkgs: "${pkgs.lz4}/bin/lz4"; + defaultArgs = ["-l"]; + ubootName = "lz4"; + extension = ".lz4"; + }; + lzop = { + executable = pkgs: "${pkgs.lzop}/bin/lzop"; + ubootName = "lzo"; + extension = ".lzo"; + }; + zstd = { + executable = pkgs: "${pkgs.zstd}/bin/zstd"; + defaultArgs = ["-10"]; + ubootName = "zstd"; + extension = ".zst"; + }; + pigz = gzip // { + executable = pkgs: "${pkgs.pigz}/bin/pigz"; + }; + pixz = xz // { + executable = pkgs: "${pkgs.pixz}/bin/pixz"; + defaultArgs = []; + }; +} diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index ed5dbdaee1714..901eb311a883f 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -1,22 +1,74 @@ -# Create an initial ramdisk containing the closure of the specified -# file system objects. An initial ramdisk is used during the initial +# Create an initramfs containing the closure of the specified +# file system objects. An initramfs is used during the initial # stages of booting a Linux system. It is loaded by the boot loader # along with the kernel image. It's supposed to contain everything # (such as kernel modules) necessary to allow us to mount the root # file system. Once the root file system is mounted, the `real' boot # script can be called. # -# An initrd is really just a gzipped cpio archive. -# -# Symlinks are created for each top-level file system object. E.g., -# `contents = {object = ...; symlink = /init;}' is a typical -# argument. - -{ stdenvNoCC, perl, cpio, contents, ubootTools +# An initramfs is a cpio archive, and may be compressed with a number +# of algorithms. +let + # Some metadata on various compression programs, relevant to naming + # the initramfs file and, if applicable, generating a u-boot image + # from it. + compressors = import ./initrd-compressor-meta.nix; + # Get the basename of the actual compression program from the whole + # compression command, for the purpose of guessing the u-boot + # compression type and filename extension. + compressorName = fullCommand: builtins.elemAt (builtins.match "([^ ]*/)?([^ ]+).*" fullCommand) 1; +in +{ stdenvNoCC, perl, cpio, ubootTools, lib, pkgsBuildHost +# Name of the derivation (not of the resulting file!) , name ? "initrd" -, compressor ? "gzip -9n" + +# Program used to compress the cpio archive; use "cat" for no compression. +# This can also be a function which takes a package set and returns the path to the compressor, +# such as `pkgs: "${pkgs.lzop}/bin/lzop"`. +, compressor ? "gzip" +, _compressorFunction ? + if lib.isFunction compressor then compressor + else if ! builtins.hasContext compressor && builtins.hasAttr compressor compressors then compressors.${compressor}.executable + else _: compressor +, _compressorExecutable ? _compressorFunction pkgsBuildHost +, _compressorName ? compressorName _compressorExecutable +, _compressorMeta ? compressors.${_compressorName} or {} + +# List of arguments to pass to the compressor program, or null to use its defaults +, compressorArgs ? null +, _compressorArgsReal ? if compressorArgs == null then _compressorMeta.defaultArgs or [] else compressorArgs + +# Filename extension to use for the compressed initramfs. This is +# included for clarity, but $out/initrd will always be a symlink to +# the final image. +# If this isn't guessed, you may want to complete the metadata above and send a PR :) +, extension ? _compressorMeta.extension or + (throw "Unrecognised compressor ${_compressorName}, please specify filename extension") + +# List of { object = path_or_derivation; symlink = "/path"; } +# The paths are copied into the initramfs in their nix store path +# form, then linked at the root according to `symlink`. +, contents + +# List of uncompressed cpio files to prepend to the initramfs. This +# can be used to add files in specified paths without them becoming +# symlinks to store paths. , prepend ? [] -, lib + +# Whether to wrap the initramfs in a u-boot image. +, makeUInitrd ? stdenvNoCC.hostPlatform.platform.kernelTarget == "uImage" + +# If generating a u-boot image, the architecture to use. The default +# guess may not align with u-boot's nomenclature correctly, so it can +# be overridden. +# See https://gitlab.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L81-106 for a list. +, uInitrdArch ? stdenvNoCC.hostPlatform.kernelArch + +# The name of the compression, as recognised by u-boot. +# See https://gitlab.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L195-204 for a list. +# If this isn't guessed, you may want to complete the metadata above and send a PR :) +, uInitrdCompression ? _compressorMeta.ubootName or + (throw "Unrecognised compressor ${_compressorName}, please specify uInitrdCompression") }: let # !!! Move this into a public lib function, it is probably useful for others @@ -24,15 +76,26 @@ let lib.concatStringsSep "-" (filter (x: !(isList x)) (split "[^a-zA-Z0-9_=.?-]+" x)); in stdenvNoCC.mkDerivation rec { - inherit name; + inherit name makeUInitrd extension uInitrdArch prepend; - builder = ./make-initrd.sh; + ${if makeUInitrd then "uinitrdCompression" else null} = uInitrdCompression; - makeUInitrd = stdenvNoCC.hostPlatform.platform.kernelTarget == "uImage"; + builder = ./make-initrd.sh; nativeBuildInputs = [ perl cpio ] ++ stdenvNoCC.lib.optional makeUInitrd ubootTools; + compress = "${_compressorExecutable} ${lib.escapeShellArgs _compressorArgsReal}"; + + # Pass the function through, for reuse in append-initrd-secrets. The + # function is used instead of the string, in order to support + # cross-compilation (append-initrd-secrets running on a different + # architecture than what the main initramfs is built on). + passthru = { + compressorExecutableFunction = _compressorFunction; + compressorArgs = _compressorArgsReal; + }; + # !!! should use XML. objects = map (x: x.object) contents; symlinks = map (x: x.symlink) contents; @@ -47,6 +110,4 @@ in stdenvNoCC.mkDerivation rec { contents (lib.range 0 (lib.length contents - 1)); pathsFromGraph = ./paths-from-graph.pl; - - inherit compressor prepend; } diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 0aeaedeb37243..c0619ef14ae01 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -39,10 +39,13 @@ mkdir -p $out for PREP in $prepend; do cat $PREP >> $out/initrd done -(cd root && find * -print0 | xargs -0r touch -h -d '@1') -(cd root && find * -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null | $compressor >> $out/initrd) +(cd root && find * .[^.*] -exec touch -h -d '@1' '{}' +) +(cd root && find * .[^.*] -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null | eval -- $compress >> "$out/initrd") if [ -n "$makeUInitrd" ]; then - mv $out/initrd $out/initrd.gz - mkimage -A arm -O linux -T ramdisk -C gzip -d $out/initrd.gz $out/initrd + mkimage -A $uInitrdArch -O linux -T ramdisk -C "$uInitrdCompression" -d $out/initrd"$extension" $out/initrd.img + # Compatibility symlink + ln -s "initrd.img" "$out/initrd" +else + ln -s "initrd" "$out/initrd$extension" fi diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index b134effab8ac3..fce0096c83d5a 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, dune, dune_2, opaline }: +{ stdenv, ocaml, findlib, dune, dune_2 }: { pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args: @@ -25,7 +25,7 @@ stdenv.mkDerivation ({ ''; installPhase = '' runHook preInstall - ${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR + dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname} runHook postInstall ''; diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 5ada40b3b9bbb..d1010ac1adb32 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -144,7 +144,7 @@ in '' export CARGO_PKG_VERSION_PATCH=${lib.elemAt version 2} export CARGO_PKG_VERSION_PRE="${versionPre}" export CARGO_PKG_HOMEPAGE="${crateHomepage}" - export NUM_JOBS=1 + export NUM_JOBS=$NIX_BUILD_CORES export RUSTC="rustc" export RUSTDOC="rustdoc" diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index f6cd54c4ee3e9..65c8880b134d6 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -146,12 +146,18 @@ let }; in runCommand "assert-outputs-${name}" { - } '' + } ('' local actualFiles=$(mktemp) cd "${crateOutput}" - find . -type f | sort >$actualFiles - diff -q ${expectedFilesFile} $actualFiles >/dev/null || { + find . -type f \ + | sort \ + '' + # sed out the hash because it differs per platform + + '' + | sed -E -e 's/-[0-9a-fA-F]{10}\.rlib/-HASH.rlib/g' \ + > "$actualFiles" + diff -q ${expectedFilesFile} "$actualFiles" > /dev/null || { echo -e "\033[0;1;31mERROR: Difference in expected output files in ${crateOutput} \033[0m" >&2 echo === Got: sed -e 's/^/ /' $actualFiles @@ -164,7 +170,7 @@ let exit 1 } touch $out - '' + '') ; in rec { @@ -594,7 +600,7 @@ let }; expectedFiles = [ "./nix-support/propagated-build-inputs" - "./lib/libtest_lib-042a1fdbef.rlib" + "./lib/libtest_lib-HASH.rlib" "./lib/link" ]; }; @@ -611,7 +617,7 @@ let }; expectedFiles = [ "./nix-support/propagated-build-inputs" - "./lib/libtest_lib-042a1fdbef.rlib" + "./lib/libtest_lib-HASH.rlib" "./lib/link" ]; }; diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 49e84f84ceb33..511371931de8f 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + declare -a autoPatchelfLibs declare -Ag autoPatchelfFailedDeps @@ -11,6 +13,8 @@ runPatchelf() { patchelf "$@" || (echo "Command failed: patchelf $*" && exit 1) } +# shellcheck disable=SC2154 +# (targetOffset is referenced but not assigned.) addEnvHooks "$targetOffset" gatherLibraries isExecutable() { @@ -116,6 +120,8 @@ autoPatchelfFile() { interpreter="$(< "$NIX_CC/nix-support/dynamic-linker")" if isExecutable "$toPatch"; then runPatchelf --set-interpreter "$interpreter" "$toPatch" + # shellcheck disable=SC2154 + # (runtimeDependencies is referenced but not assigned.) if [ -n "$runtimeDependencies" ]; then for dep in $runtimeDependencies; do rpath="$rpath${rpath:+:}$dep/lib" @@ -129,11 +135,13 @@ autoPatchelfFile() { # clear the RPATH first. runPatchelf --remove-rpath "$toPatch" + # If the file is not a dynamic executable, ldd/sed will fail, + # in which case we return, since there is nothing left to do. local missing missing="$( ldd "$toPatch" 2> /dev/null | \ sed -n -e 's/^[\t ]*\([^ ]\+\) => not found.*/\1/p' - )" + )" || return 0 # This ensures that we get the output of all missing dependencies instead # of failing at the first one, because it's more useful when working on a @@ -175,10 +183,10 @@ addAutoPatchelfSearchPath() { esac done - for file in \ - $(find "$@" "${findOpts[@]}" \! -type d \ - \( -name '*.so' -o -name '*.so.*' \)) - do addToDepCache "$file"; done + while IFS= read -r -d '' file; do + addToDepCache "$file" + done < <(find "$@" "${findOpts[@]}" \! -type d \ + \( -name '*.so' -o -name '*.so.*' \) -print0) } autoPatchelf() { @@ -231,6 +239,8 @@ autoPatchelf() { echo "autoPatchelfHook could not satisfy dependency $failedDep wanted by ${autoPatchelfFailedDeps[$failedDep]}" depsMissing=1 done + # shellcheck disable=SC2154 + # (autoPatchelfIgnoreMissingDeps is referenced but not assigned.) if [[ $depsMissing == 1 && -z "$autoPatchelfIgnoreMissingDeps" ]]; then echo "Add the missing dependencies to the build inputs or set autoPatchelfIgnoreMissingDeps=true" exit 1 diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 2f18e96e4ce2e..5f3c7e1d621cb 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1196,4 +1196,4 @@ rec { `debDistros' sets. */ diskImages = lib.mapAttrs (name: f: f {}) diskImageFuns; -} // import ./windows pkgs +} diff --git a/pkgs/build-support/vm/windows/bootstrap.nix b/pkgs/build-support/vm/windows/bootstrap.nix deleted file mode 100644 index 3b06d8f47490c..0000000000000 --- a/pkgs/build-support/vm/windows/bootstrap.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ stdenv, fetchurl, vmTools, writeScript, writeText, runCommand, makeInitrd -, python, perl, coreutils, dosfstools, gzip, mtools, netcat-gnu, openssh, qemu -, samba, socat, vde2, cdrkit, pathsFromGraph, gnugrep -}: - -{ isoFile, productKey, arch ? null }: - -with stdenv.lib; - -let - controller = import ./controller { - inherit stdenv writeScript vmTools makeInitrd; - inherit samba vde2 openssh socat netcat-gnu coreutils gzip gnugrep; - }; - - mkCygwinImage = import ./cygwin-iso { - inherit stdenv fetchurl runCommand python perl cdrkit pathsFromGraph; - arch = let - defaultArch = if stdenv.is64bit then "x86_64" else "i686"; - in if arch == null then defaultArch else arch; - }; - - installer = import ./install { - inherit controller mkCygwinImage; - inherit stdenv runCommand openssh qemu writeText dosfstools mtools; - }; -in rec { - installedVM = installer { - inherit isoFile productKey; - }; - - runInVM = img: attrs: controller (attrs // { - inherit (installedVM) sshKey; - qemuArgs = attrs.qemuArgs or [] ++ [ - "-boot order=c" - "-drive file=${img},index=0,media=disk" - ]; - }); - - runAndSuspend = let - drives = { - s = { - source = "nixstore"; - target = "/nix/store"; - }; - x = { - source = "xchg"; - target = "/tmp/xchg"; - }; - }; - - genDriveCmds = letter: { source, target }: [ - "net use ${letter}: '\\\\192.168.0.2\\${source}' /persistent:yes" - "mkdir -p '${target}'" - "mount -o bind '/cygdrive/${letter}' '${target}'" - "echo '/cygdrive/${letter} ${target} none bind 0 0' >> /etc/fstab" - ]; - in runInVM "winvm.img" { - command = concatStringsSep " && " ([ - "net config server /autodisconnect:-1" - ] ++ concatLists (mapAttrsToList genDriveCmds drives)); - suspendTo = "state.gz"; - }; - - suspendedVM = stdenv.mkDerivation { - name = "cygwin-suspended-vm"; - buildCommand = '' - ${qemu}/bin/qemu-img create \ - -b "${installedVM}/disk.img" \ - -f qcow2 winvm.img - ${runAndSuspend} - mkdir -p "$out" - cp winvm.img "$out/disk.img" - cp state.gz "$out/state.gz" - ''; - }; - - resumeAndRun = command: runInVM "${suspendedVM}/disk.img" { - resumeFrom = "${suspendedVM}/state.gz"; - qemuArgs = singleton "-snapshot"; - inherit command; - }; -} diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix deleted file mode 100644 index 9d13983a28336..0000000000000 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ /dev/null @@ -1,263 +0,0 @@ -{ stdenv, writeScript, vmTools, makeInitrd -, samba, vde2, openssh, socat, netcat-gnu, coreutils, gnugrep, gzip -, runtimeShell -}: - -{ sshKey -, qemuArgs ? [] -, command ? "sync" -, suspendTo ? null -, resumeFrom ? null -, installMode ? false -}: - -with stdenv.lib; - -let - preInitScript = writeScript "preinit.sh" '' - #!${vmTools.initrdUtils}/bin/ash -e - export PATH=${vmTools.initrdUtils}/bin - mount -t proc none /proc - mount -t sysfs none /sys - for arg in $(cat /proc/cmdline); do - if [ "x''${arg#command=}" != "x$arg" ]; then - command="''${arg#command=}" - fi - done - - for i in $(cat ${modulesClosure}/insmod-list); do - insmod $i - done - - mkdir -p /dev /fs - - mount -t tmpfs none /dev - mknod /dev/null c 1 3 - mknod /dev/zero c 1 5 - mknod /dev/random c 1 8 - mknod /dev/urandom c 1 9 - mknod /dev/tty c 5 0 - - ifconfig lo up - ifconfig eth0 up 192.168.0.2 - - mount -t tmpfs none /fs - mkdir -p /fs/nix/store /fs/xchg /fs/dev /fs/sys /fs/proc /fs/etc /fs/tmp - - mount -o bind /dev /fs/dev - mount -t sysfs none /fs/sys - mount -t proc none /fs/proc - - mount -t 9p \ - -o trans=virtio,version=9p2000.L,cache=loose \ - store /fs/nix/store - - mount -t 9p \ - -o trans=virtio,version=9p2000.L \ - xchg /fs/xchg - - echo root:x:0:0::/root:/bin/false > /fs/etc/passwd - - set +e - chroot /fs $command $out - echo $? > /fs/xchg/in-vm-exit - - poweroff -f - ''; - - initrd = makeInitrd { - contents = singleton { - object = preInitScript; - symlink = "/init"; - }; - }; - - loopForever = "while :; do ${coreutils}/bin/sleep 1; done"; - - initScript = writeScript "init.sh" ('' - #!${runtimeShell} - ${coreutils}/bin/cp -L "${sshKey}" /ssh.key - ${coreutils}/bin/chmod 600 /ssh.key - '' + (if installMode then '' - echo -n "Waiting for Windows installation to finish..." - while ! ${netcat-gnu}/bin/netcat -z 192.168.0.1 22; do - echo -n . - # Print a dot every 10 seconds only to shorten line length. - ${coreutils}/bin/sleep 10 - done - ${coreutils}/bin/touch /xchg/waiting_done - echo " success." - # Loop forever, because this VM is going to be killed. - ${loopForever} - '' else '' - ${coreutils}/bin/mkdir -p /etc/samba /etc/samba/private \ - /var/lib/samba /var/log /var/run - ${coreutils}/bin/cat > /etc/samba/smb.conf <<CONFIG - [global] - security = user - map to guest = Bad User - guest account = root - workgroup = cygwin - netbios name = controller - server string = %h - log level = 1 - max log size = 1000 - log file = /var/log/samba.log - - [nixstore] - path = /nix/store - writable = yes - guest ok = yes - - [xchg] - path = /xchg - writable = yes - guest ok = yes - CONFIG - - ${samba}/sbin/nmbd -D - ${samba}/sbin/smbd -D - - echo -n "Waiting for Windows VM to become available..." - while ! ${netcat-gnu}/bin/netcat -z 192.168.0.1 22; do - echo -n . - ${coreutils}/bin/sleep 1 - done - ${coreutils}/bin/touch /xchg/waiting_done - echo " success." - - ${openssh}/bin/ssh \ - -o UserKnownHostsFile=/dev/null \ - -o StrictHostKeyChecking=no \ - -i /ssh.key \ - -l Administrator \ - 192.168.0.1 -- ${lib.escapeShellArg command} - '') + optionalString (suspendTo != null) '' - ${coreutils}/bin/touch /xchg/suspend_now - ${loopForever} - ''); - - kernelAppend = concatStringsSep " " [ - "panic=1" - "loglevel=4" - "console=tty1" - "console=ttyS0" - "command=${initScript}" - ]; - - controllerQemuArgs = concatStringsSep " " (maybeKvm64 ++ [ - "-pidfile $CTRLVM_PIDFILE" - "-nographic" - "-no-reboot" - "-virtfs local,path=/nix/store,security_model=none,mount_tag=store" - "-virtfs local,path=$XCHG_DIR,security_model=none,mount_tag=xchg" - "-kernel ${modulesClosure.kernel}/bzImage" - "-initrd ${initrd}/initrd" - "-append \"${kernelAppend}\"" - "-net nic,vlan=0,macaddr=52:54:00:12:01:02,model=virtio" - "-net vde,vlan=0,sock=$QEMU_VDE_SOCKET" - ]); - - maybeKvm64 = optional (stdenv.hostPlatform.system == "x86_64-linux") "-cpu kvm64"; - - cygwinQemuArgs = concatStringsSep " " (maybeKvm64 ++ [ - "-monitor unix:$MONITOR_SOCKET,server,nowait" - "-pidfile $WINVM_PIDFILE" - "-nographic" - "-net nic,vlan=0,macaddr=52:54:00:12:01:01" - "-net vde,vlan=0,sock=$QEMU_VDE_SOCKET" - "-rtc base=2010-01-01,clock=vm" - ] ++ qemuArgs ++ optionals (resumeFrom != null) [ - "-incoming 'exec: ${gzip}/bin/gzip -c -d \"${resumeFrom}\"'" - ]); - - modulesClosure = overrideDerivation vmTools.modulesClosure (o: { - rootModules = o.rootModules ++ singleton "virtio_net"; - }); - - preVM = '' - (set; declare -p) > saved-env - XCHG_DIR="$(${coreutils}/bin/mktemp -d nix-vm.XXXXXXXXXX --tmpdir)" - ${coreutils}/bin/mv saved-env "$XCHG_DIR/" - - eval "$preVM" - - QEMU_VDE_SOCKET="$(pwd)/vde.ctl" - MONITOR_SOCKET="$(pwd)/monitor" - WINVM_PIDFILE="$(pwd)/winvm.pid" - CTRLVM_PIDFILE="$(pwd)/ctrlvm.pid" - ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" --dirmode 0700 & - echo 'alive?' | ${socat}/bin/socat - \ - UNIX-CONNECT:$QEMU_VDE_SOCKET/ctl,retry=20 - ''; - - vmExec = '' - ${vmTools.qemuProg} ${controllerQemuArgs} & - ${vmTools.qemuProg} ${cygwinQemuArgs} & - echo -n "Waiting for VMs to start up..." - timeout=60 - while ! test -e "$WINVM_PIDFILE" -a -e "$CTRLVM_PIDFILE"; do - timeout=$(($timeout - 1)) - echo -n . - if test $timeout -le 0; then - echo " timed out." - exit 1 - fi - ${coreutils}/bin/sleep 1 - done - echo " done." - ''; - - checkDropOut = '' - if ! test -e "$XCHG_DIR/waiting_done" && - ! kill -0 $(< "$WINVM_PIDFILE"); then - echo "Windows VM has dropped out early, bailing out!" >&2 - exit 1 - fi - ''; - - toMonitor = "${socat}/bin/socat - UNIX-CONNECT:$MONITOR_SOCKET"; - - postVM = if suspendTo != null then '' - while ! test -e "$XCHG_DIR/suspend_now"; do - ${checkDropOut} - ${coreutils}/bin/sleep 1 - done - ${toMonitor} <<CMD - stop - migrate_set_speed 4095m - migrate "exec:${gzip}/bin/gzip -c > '${suspendTo}'" - CMD - echo -n "Waiting for memory dump to finish..." - while ! echo info migrate | ${toMonitor} | \ - ${gnugrep}/bin/grep -qi '^migration *status: *complete'; do - ${coreutils}/bin/sleep 1 - echo -n . - done - echo " done." - echo quit | ${toMonitor} - wait $(< "$WINVM_PIDFILE") - eval "$postVM" - exit 0 - '' else if installMode then '' - wait $(< "$WINVM_PIDFILE") - eval "$postVM" - exit 0 - '' else '' - while kill -0 $(< "$CTRLVM_PIDFILE"); do - ${checkDropOut} - done - if ! test -e "$XCHG_DIR/in-vm-exit"; then - echo "Virtual machine didn't produce an exit code." - exit 1 - fi - eval "$postVM" - exit $(< "$XCHG_DIR/in-vm-exit") - ''; - -in writeScript "run-cygwin-vm.sh" '' - #!${stdenv.shell} -e - ${preVM} - ${vmExec} - ${postVM} -'' diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix deleted file mode 100644 index 76cd41a75bc7b..0000000000000 --- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchurl, runCommand, python, perl, xorriso, pathsFromGraph -, arch ? "x86_64" -}: - -{ packages ? [] -, mirror ? "http://ftp.gwdg.de/pub/linux/sources.redhat.com/cygwin" -, extraContents ? [] -}: - -let - cygPkgList = if arch == "x86_64" then fetchurl { - url = "${mirror}/x86_64/setup.ini"; - sha256 = "0arrxvxbl85l82iy648snx5cl952w791p45p0dfg1xpiaf96cbkj"; - } else fetchurl { - url = "${mirror}/x86/setup.ini"; - sha256 = "1fayx34868vd5h2nah7chiw65sl3i9qzrwvs7lrlv2h8k412vb69"; - }; - - cygwinCross = (import ../../../../.. { - localSystem = stdenv.hostPlatform; - crossSystem = { - libc = "msvcrt"; - platform = {}; - inherit arch; - config = "${arch}-w64-mingw32"; - }; - }).windows.cygwinSetup; - - makeCygwinClosure = { packages, packageList }: let - expr = import (runCommand "cygwin.nix" { buildInputs = [ python ]; } '' - python ${./mkclosure.py} "${packages}" ${toString packageList} > "$out" - ''); - gen = { url, hash }: { - source = fetchurl { - url = "${mirror}/${url}"; - sha512 = hash; - }; - target = url; - }; - in map gen expr; - -in import ../../../../../nixos/lib/make-iso9660-image.nix { - inherit stdenv perl xorriso pathsFromGraph; - syslinux = null; - contents = [ - { source = "${cygwinCross}/bin/setup.exe"; - target = "setup.exe"; - } - { source = cygPkgList; - target = "setup.ini"; - } - ] ++ makeCygwinClosure { - packages = cygPkgList; - packageList = packages; - } ++ extraContents; -} diff --git a/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py b/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py deleted file mode 100644 index 4c0d67c43bacc..0000000000000 --- a/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py +++ /dev/null @@ -1,78 +0,0 @@ -# Ugliest Python code I've ever written. -- aszlig -import sys - -def get_plist(path): - in_pack = False - in_str = False - current_key = None - buf = "" - packages = {} - package_name = None - package_attrs = {} - with open(path, 'r') as setup: - for line in setup: - if in_str and line.rstrip().endswith('"'): - package_attrs[current_key] = buf + line.rstrip()[:-1] - in_str = False - continue - elif in_str: - buf += line - continue - - if line.startswith('@'): - in_pack = True - package_name = line[1:].strip() - package_attrs = {} - elif in_pack and ':' in line: - key, value = line.split(':', 1) - if value.lstrip().startswith('"'): - if value.lstrip()[1:].rstrip().endswith('"'): - value = value.strip().strip('"') - else: - in_str = True - current_key = key.strip().lower() - buf = value.lstrip()[1:] - continue - package_attrs[key.strip().lower()] = value.strip() - elif in_pack: - in_pack = False - packages[package_name] = package_attrs - return packages - -def main(): - packages = get_plist(sys.argv[1]) - to_include = set() - - def traverse(package): - to_include.add(package) - attrs = packages.get(package, {}) - deps = attrs.get('requires', '').split() - for new_dep in set(deps) - to_include: - traverse(new_dep) - - map(traverse, sys.argv[2:]) - - sys.stdout.write('[\n') - for package, attrs in packages.iteritems(): - if package not in to_include: - cats = [c.lower() for c in attrs.get('category', '').split()] - if 'base' not in cats: - continue - - install_line = attrs.get('install') - if install_line is None: - continue - - url, size, hash = install_line.split(' ', 2) - - pack = [ - ' {', - ' url = "{0}";'.format(url), - ' hash = "{0}";'.format(hash), - ' }', - ]; - sys.stdout.write('\n'.join(pack) + '\n') - sys.stdout.write(']\n') - -if __name__ == '__main__': - main() diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix deleted file mode 100644 index 309241c36dee1..0000000000000 --- a/pkgs/build-support/vm/windows/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -#note: the hardcoded /bin/sh is required for the VM's cygwin shell -pkgs: - -let - bootstrapper = import ./bootstrap.nix { - inherit (pkgs) stdenv vmTools writeScript writeText runCommand makeInitrd; - inherit (pkgs) coreutils dosfstools gzip mtools netcat-gnu openssh qemu samba; - inherit (pkgs) socat vde2 fetchurl python perl cdrkit pathsFromGraph; - inherit (pkgs) gnugrep; - }; - - builder = '' - source /tmp/xchg/saved-env 2> /dev/null || true - export NIX_STORE=/nix/store - export NIX_BUILD_TOP=/tmp - export TMPDIR=/tmp - export PATH=/empty - cd "$NIX_BUILD_TOP" - exec $origBuilder $origArgs - ''; - -in { - runInWindowsVM = drv: pkgs.lib.overrideDerivation drv (attrs: let - bootstrap = bootstrapper attrs.windowsImage; - in { - requiredSystemFeatures = [ "kvm" ]; - builder = pkgs.stdenv.shell; - args = ["-e" (bootstrap.resumeAndRun builder)]; - windowsImage = bootstrap.suspendedVM; - origArgs = attrs.args; - origBuilder = if attrs.builder == attrs.stdenv.shell - then "/bin/sh" - else attrs.builder; - - postHook = '' - PATH=/usr/bin:/bin:/usr/sbin:/sbin - SHELL=/bin/sh - eval "$origPostHook" - ''; - - origPostHook = attrs.postHook or ""; - fixupPhase = ":"; - }); -} diff --git a/pkgs/build-support/vm/windows/install/default.nix b/pkgs/build-support/vm/windows/install/default.nix deleted file mode 100644 index fe8e8f61de029..0000000000000 --- a/pkgs/build-support/vm/windows/install/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ stdenv, runCommand, openssh, qemu, controller, mkCygwinImage -, writeText, dosfstools, mtools -}: - -{ isoFile -, productKey -}: - -let - bootstrapAfterLogin = runCommand "bootstrap.sh" {} '' - cat > "$out" <<EOF - mkdir -p ~/.ssh - cat > ~/.ssh/authorized_keys <<PUBKEY - $(cat "${cygwinSshKey}/key.pub") - PUBKEY - ssh-host-config -y -c 'binmode ntsec' -w dummy - cygrunsrv -S sshd - shutdown -s 5 - EOF - ''; - - cygwinSshKey = stdenv.mkDerivation { - name = "snakeoil-ssh-cygwin"; - buildCommand = '' - mkdir -p "$out" - ${openssh}/bin/ssh-keygen -t ecdsa -f "$out/key" -N "" - ''; - }; - - sshKey = "${cygwinSshKey}/key"; - - packages = [ "openssh" "shutdown" ]; - - floppyCreator = import ./unattended-image.nix { - inherit stdenv writeText dosfstools mtools; - }; - - instfloppy = floppyCreator { - cygwinPackages = packages; - inherit productKey; - }; - - cygiso = mkCygwinImage { - inherit packages; - extraContents = stdenv.lib.singleton { - source = bootstrapAfterLogin; - target = "bootstrap.sh"; - }; - }; - - installController = controller { - inherit sshKey; - installMode = true; - qemuArgs = [ - "-boot order=c,once=d" - "-drive file=${instfloppy},readonly,index=0,if=floppy" - "-drive file=winvm.img,index=0,media=disk" - "-drive file=${isoFile},index=1,media=cdrom" - "-drive file=${cygiso}/iso/cd.iso,index=2,media=cdrom" - ]; - }; - -in stdenv.mkDerivation { - name = "cygwin-base-vm"; - buildCommand = '' - ${qemu}/bin/qemu-img create -f qcow2 winvm.img 2G - ${installController} - mkdir -p "$out" - cp winvm.img "$out/disk.img" - ''; - passthru = { - inherit sshKey; - }; -} diff --git a/pkgs/build-support/vm/windows/install/unattended-image.nix b/pkgs/build-support/vm/windows/install/unattended-image.nix deleted file mode 100644 index 5b1ff84cf44de..0000000000000 --- a/pkgs/build-support/vm/windows/install/unattended-image.nix +++ /dev/null @@ -1,123 +0,0 @@ -{ stdenv, writeText, dosfstools, mtools }: - -{ productKey -, shExecAfterwards ? "E:\\bootstrap.sh" -, cygwinRoot ? "C:\\cygwin" -, cygwinSetup ? "E:\\setup.exe" -, cygwinRepository ? "E:\\" -, cygwinPackages ? [ "openssh" ] -}: - -let - afterSetup = [ - cygwinSetup - "-L -n -q" - "-l ${cygwinRepository}" - "-R ${cygwinRoot}" - "-C base" - ] ++ map (p: "-P ${p}") cygwinPackages; - - winXpUnattended = writeText "winnt.sif" '' - [Data] - AutoPartition = 1 - AutomaticUpdates = 0 - MsDosInitiated = 0 - UnattendedInstall = Yes - - [Unattended] - DUDisable = Yes - DriverSigningPolicy = Ignore - Hibernation = No - OemPreinstall = No - OemSkipEula = Yes - Repartition = Yes - TargetPath = \WINDOWS - UnattendMode = FullUnattended - UnattendSwitch = Yes - WaitForReboot = No - - [GuiUnattended] - AdminPassword = "nopasswd" - AutoLogon = Yes - AutoLogonCount = 1 - OEMSkipRegional = 1 - OemSkipWelcome = 1 - ServerWelcome = No - TimeZone = 85 - - [UserData] - ComputerName = "cygwin" - FullName = "cygwin" - OrgName = "" - ProductKey = "${productKey}" - - [Networking] - InstallDefaultComponents = Yes - - [Identification] - JoinWorkgroup = cygwin - - [NetAdapters] - PrimaryAdapter = params.PrimaryAdapter - - [params.PrimaryAdapter] - InfID = * - - [params.MS_MSClient] - - [NetProtocols] - MS_TCPIP = params.MS_TCPIP - - [params.MS_TCPIP] - AdapterSections=params.MS_TCPIP.PrimaryAdapter - - [params.MS_TCPIP.PrimaryAdapter] - DHCP = No - IPAddress = 192.168.0.1 - SpecificTo = PrimaryAdapter - SubnetMask = 255.255.255.0 - WINS = No - - ; Turn off all components - [Components] - ${stdenv.lib.concatMapStrings (comp: "${comp} = Off\n") [ - "AccessOpt" "Appsrv_console" "Aspnet" "BitsServerExtensionsISAPI" - "BitsServerExtensionsManager" "Calc" "Certsrv" "Certsrv_client" - "Certsrv_server" "Charmap" "Chat" "Clipbook" "Cluster" "Complusnetwork" - "Deskpaper" "Dialer" "Dtcnetwork" "Fax" "Fp_extensions" "Fp_vdir_deploy" - "Freecell" "Hearts" "Hypertrm" "IEAccess" "IEHardenAdmin" "IEHardenUser" - "Iis_asp" "Iis_common" "Iis_ftp" "Iis_inetmgr" "Iis_internetdataconnector" - "Iis_nntp" "Iis_serversideincludes" "Iis_smtp" "Iis_webdav" "Iis_www" - "Indexsrv_system" "Inetprint" "Licenseserver" "Media_clips" "Media_utopia" - "Minesweeper" "Mousepoint" "Msmq_ADIntegrated" "Msmq_Core" - "Msmq_HTTPSupport" "Msmq_LocalStorage" "Msmq_MQDSService" - "Msmq_RoutingSupport" "Msmq_TriggersService" "Msnexplr" "Mswordpad" - "Netcis" "Netoc" "OEAccess" "Objectpkg" "Paint" "Pinball" "Pop3Admin" - "Pop3Service" "Pop3Srv" "Rec" "Reminst" "Rootautoupdate" "Rstorage" "SCW" - "Sakit_web" "Solitaire" "Spider" "TSWebClient" "Templates" - "TerminalServer" "UDDIAdmin" "UDDIDatabase" "UDDIWeb" "Vol" "WMAccess" - "WMPOCM" "WbemMSI" "Wms" "Wms_admin_asp" "Wms_admin_mmc" "Wms_isapi" - "Wms_server" "Zonegames" - ]} - - [WindowsFirewall] - Profiles = WindowsFirewall.TurnOffFirewall - - [WindowsFirewall.TurnOffFirewall] - Mode = 0 - - [SetupParams] - UserExecute = "${stdenv.lib.concatStringsSep " " afterSetup}" - - [GuiRunOnce] - Command0 = "${cygwinRoot}\bin\bash -l ${shExecAfterwards}" - ''; - -in stdenv.mkDerivation { - name = "unattended-floppy.img"; - buildCommand = '' - dd if=/dev/zero of="$out" count=1440 bs=1024 - ${dosfstools}/sbin/mkfs.msdos "$out" - ${mtools}/bin/mcopy -i "$out" "${winXpUnattended}" ::winnt.sif - ''; -} diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 8b8e4f25fef26..fbae89bcf013b 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "4.0.3"; + version = "4.2.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 13fad48f900d4..5cb0b53114d1e 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,24 +1,24 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1xc45rs09aj899wz9ghyizq6ddbgxpkqq5bl1jc89hls5laf7qjb"; - iosevka-aile = "0n52lfn7awc28a4f5yh4my8q4ikzza705kp69chfw9jm2xx79npc"; - iosevka-curly = "0m51r0bc25khllq8nsfgsldhwfs7kzl8kqasivjlm14mpv5080fn"; - iosevka-curly-slab = "0ffiz2kg43kc2dxv48sjji33ra3kc6sy8vlard93c601fqjmrjws"; - iosevka-etoile = "1fj8g7sjp9idjh14iqk4wsz3rdarlmq7amcdsr0dznwyivx8a9wx"; - iosevka-slab = "0qpfzyi050zca0bwhb460nvcaarij4srhify0rb8sf9ygpzyvnjh"; - iosevka-sparkle = "00dw894930xdikai8bcaimp0a3720diwi0r7ii52jwl4d70w53dx"; - iosevka-ss01 = "1c6pfv792cjf5xqjnhjmpvcy36mzr7ymv6h0qwjl94mglw8qrhqs"; - iosevka-ss02 = "1j05p2gky2z2bm5gajnm8mbbc7w1isg8m66lhd7mc42y6ygs0b2g"; - iosevka-ss03 = "1kn9khfkk53my4mhpf43gl4ryd4ibw21f7jv553xlrnhm3vn8hxy"; - iosevka-ss04 = "0bc4mqkxvjyvslrv43rwcmmpfyjiszpi77f6bng60h25ah3kdnqs"; - iosevka-ss05 = "01m2z1vr5a404kxbzgcnavhsz0jj7hqda61bcvvir6xdqb881rp3"; - iosevka-ss06 = "1qdlm9ky3rn6m9mgi2idwiy6jd3f0f74j87ms097khvnh6jg2wd7"; - iosevka-ss07 = "14il043liricgxximsrklx36sfs4qa1a4dw017jaaqarr0gyar49"; - iosevka-ss08 = "19la0b99msphhfbbw88fwkh0ni875q73976mdskvr5j63715cqx3"; - iosevka-ss09 = "1m3rh42941r6nk5dq136vs8iaq8vhclcbl955f6zxcgk4aqdmp84"; - iosevka-ss10 = "1kda7k8jqgpfajq1c6n656wpab7hh9icyiy31l21ilpmj0dzsxx6"; - iosevka-ss11 = "1ch0c3i3063955ckp1af384ad70m6fiff6x6rxqk76s2vsywmxcf"; - iosevka-ss12 = "01s16301rm8mr833zlairv19rb5aavb0lidhy9cr2p0d59p96b0h"; - iosevka-ss13 = "0gnlmfka2hyr1g7a4gw97776aa6j7iz9zjhxliam0gh0iwnz5w41"; - iosevka-ss14 = "1rar6cs8d4x9p0qnwvlkjcnfh1bhk6v7r05v1l68wlsmvrvriv17"; + iosevka = "1s9nyq8gjmmah5rpflffl0wi0klnlsvzmy7b39vnpp2sp6ng9mv3"; + iosevka-aile = "0x2ccjnmi9hqms5jkfnkn30y9gd3adiwjvn9gzq8d6a563h61fik"; + iosevka-curly = "03n0f9nzjywb5q3w59ck5sq500ks5xxlgf9dpncr3c7i2dawss41"; + iosevka-curly-slab = "09qnd2vzl4v59c0d534mj06zxwa3rdwrhkwy191v6p79lfxp482x"; + iosevka-etoile = "0j3ah72dmk7fzcln9755y3xnzn7343lfrg95kb3xmqm2zyg0mbrw"; + iosevka-slab = "0prnm3nh8rgn6jivfj2fw7x12m8qqam8xnl45ip5ck4348piypx3"; + iosevka-sparkle = "1y180rwrxrvwd98hk1d07y0vs8h5rj7ipkhsqlv60h82pigxhl4a"; + iosevka-ss01 = "04q9vby5q9ylvv2myl3h2xfyq3s594wnwj0b956pivwwamhp0g3v"; + iosevka-ss02 = "14d5i88ls8zfbis5s7z95dcrpxqyqr2wzx90c5a4xpcdjd4n7fgg"; + iosevka-ss03 = "1zqqq11rcjmifc4qf5p2xcqhqp5ca2pgvzv8xirr6mq4knrvxrpq"; + iosevka-ss04 = "1xnnqyvyrz820dzfyjj84v3j1q8krykmwxw5xml4v7kk79agc7vk"; + iosevka-ss05 = "07w78jw23hxwzx65ampwzv691p12n0pvk8vnw2mnnspflirpm62r"; + iosevka-ss06 = "11brqklhk3sfhqyavyi5rggsn3286n404gphmh0frz65wj3k8lc6"; + iosevka-ss07 = "037vaxpgdpa6p9nmqcsa1mi7pn94300cd71kbr9lw8mql9wc2y9n"; + iosevka-ss08 = "0ga1bwb2d1rizr0910bcqabcj819dcd0bxp7cwbxnzq6i7ca4hj1"; + iosevka-ss09 = "1khjhn0lfpk8g1yx3558w6kkj0pd5b7kxbf0z97w1nvah3d5v50m"; + iosevka-ss10 = "0zp5173799vacssj0lsj3ck82b03qyk9cyfwa3j7xa2dhplrjfp2"; + iosevka-ss11 = "124a3i7iy9z7adxcb8yw3795gk52cw7ngsim8qjhrhcd2bjr0jvg"; + iosevka-ss12 = "1rd61ry3ihw311c926wjl9sc71bz0ligya07m7km1905dhlhirsv"; + iosevka-ss13 = "0jm3djc4rlzk22jn3syv4mwd0fz82z4lnyk3dkq815yyw6vmqkz0"; + iosevka-ss14 = "1a9a1bvzsbprmxfh19m78s82rfmxng4sambz6m4gd9mm14kjjp5r"; } diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix index fc4d76f6ad6bb..42012e43d4bf4 100644 --- a/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,24 +1,24 @@ { lib, fetchzip }: let - version = "2.210"; + version = "2.221"; in fetchzip { name = "JetBrainsMono-${version}"; url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; - sha256 = "05csy42qji8xbaq5iap2nmki0d0cbiwiq9kbzjd1cah9qn6gfill"; + sha256 = "1in3znnj0i0yfwj93ncxi3s1cp9lhgwnv2r14br47rr7vik4zjr6"; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; meta = with lib; { description = "A typeface made for developers"; homepage = "https://jetbrains.com/mono/"; + changelog = "https://github.com/JetBrains/JetBrainsMono/blob/v${version}/Changelog.md"; license = licenses.ofl; maintainers = [ maintainers.marsam ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/meslo-lgs-nf/default.nix b/pkgs/data/fonts/meslo-lgs-nf/default.nix new file mode 100644 index 0000000000000..36ce33cd7d2d6 --- /dev/null +++ b/pkgs/data/fonts/meslo-lgs-nf/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "meslo-lgs-nf"; + version = "2020-03-22"; + + src = fetchFromGitHub { + owner = "romkatv"; + repo = "powerlevel10k-media"; + rev = "32c7d40239c93507277f14522be90b5750f442c9"; + sha256 = "10hq4whai1rqj495w4n80p0y21am8rihm4rc40xq7241d6dzilrd"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp $src/*.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "Meslo Nerd Font patched for Powerlevel10k"; + homepage = "https://github.com/romkatv/powerlevel10k-media"; + license = licenses.asl20; + maintainers = with maintainers; [ bbigras ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/data/fonts/stix-two/default.nix index e6e4009020aeb..1e32ebbf16a9d 100644 --- a/pkgs/data/fonts/stix-two/default.nix +++ b/pkgs/data/fonts/stix-two/default.nix @@ -1,25 +1,22 @@ -{ stdenv, fetchFromGitHub }: - +{ lib, fetchzip }: let - version = "2.0.2"; -in fetchFromGitHub { + version = "2.10"; +in +fetchzip { name = "stix-two-${version}"; - owner = "stipub"; - repo = "stixfonts"; - rev = "v${version}"; + url = "https://github.com/stipub/stixfonts/raw/v${version}/zipfiles/STIX${builtins.replaceStrings [ "." ] [ "_" ] version}-all.zip"; + + sha256 = "1xvh5c5asbasfa333mizimvdp209g0lppbwv2p0cg3ixfpxgq4dl"; postFetch = '' - tar xf $downloadedFile --strip=1 - install -m444 -Dt $out/share/fonts/opentype/ OTF/*.otf - install -m444 -Dt $out/share/fonts/woff/ WOFF/*.woff - install -m444 -Dt $out/share/fonts/woff2/ WOFF2/*.woff2 + mkdir -p $out/share/fonts/ + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "1ah8s0cb67yv4ll8zfs01mdh9m5i2lbkrfbmkhi1xdid6pxsk32x"; - - meta = with stdenv.lib; { - homepage = "http://www.stixfonts.org/"; + meta = with lib; { + homepage = "https://www.stixfonts.org/"; description = "Fonts for Scientific and Technical Information eXchange"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix index 2cbf1c5063211..b0de2ac3b1320 100644 --- a/pkgs/data/icons/luna-icons/default.nix +++ b/pkgs/data/icons/luna-icons/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "0.6"; + version = "0.9.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1lm7ws7in8cjjl38c7xw67jr42d717kk5kkfac7rprk0z7pb104l"; + sha256 = "0mz5cayjgsc109nv7kdkn3gn1n79bl3hb773lrzrr0k2zblxg353"; }; nativeBuildInputs = [ @@ -35,6 +35,12 @@ stdenv.mkDerivation rec { mkdir -p $out/share/icons cp -a Luna* $out/share/icons + # remove files with spaces in the name, otherwise + # gtk-update-icon-cache fails with the message "The generated cache + # was invalid" + # https://github.com/darkomarko42/Luna-Icons/issues/2 + rm "$out/share/icons/Luna/scalable/apps/yast-checkmedia (copia).svg" + for theme in $out/share/icons/*; do gtk-update-icon-cache "$theme" done diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 0545c0e5efaeb..ad8c39831736c 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -17,7 +17,7 @@ let sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy"; }; - version = "3.57"; + version = "3.60"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in @@ -26,7 +26,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/nss-${version}.tar.gz"; - sha256 = "55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382"; + sha256 = "hKvVV1q4dMU65RG9Rh5dCGjRobOE7kB1MVTN0dWQ/j0="; }; outputs = [ "out" "unbundled" ]; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 9f21ca1eeb7bc..351ca123df207 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/a82d2463451cfd47772b3fb331b1a0e8386675ef.tar.gz"; - sha256 = "0l2h2z0982nmw3kq9r6ppwgs7ar4bda9c808mc2nkcyfmcnkdl6w"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/f20dd1d767313d653d6f0c6dd9a82f92d36ecb4c.tar.gz"; + sha256 = "1prawfbp6390dlgfvd3hxvgdab7rfkr88j35m5cbk3a4hxghkyj3"; } diff --git a/pkgs/data/themes/sweet/default.nix b/pkgs/data/themes/sweet/default.nix index 9d3603cbf5202..6ba7ae40c6828 100644 --- a/pkgs/data/themes/sweet/default.nix +++ b/pkgs/data/themes/sweet/default.nix @@ -1,46 +1,46 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "sweet"; - version = "1.10.5"; + version = "2.0"; srcs = [ (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Ambar-Blue.zip"; - sha256 = "11040hx8ci4vbnyaj63zj924v0ln7rjm9a28mcqdax60h3dp12lj"; + url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-Ambar-Blue.tar.xz"; + sha256 = "028pk07im7pab8a2vh3bvjm8jg37dpvn4c1mwn6vhb6wcr9v5c75"; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Ambar.zip"; - sha256 = "0lvnjmirpwdav8q0bfbhybwkr2h6dilc7lhhj18xd2k57xadjmxr"; + url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-Ambar.tar.xz"; + sha256 = "0zmdmqndj65kr43g3z57blrmv0y856zlfprm6y45zbf4xz3ybkg6"; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Dark.zip"; - sha256 = "0a7mh1pgvi8w1ahsmvgnmpdawm30lcjqk4zqvg0lqadsd04dn4h1"; + url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-Dark.tar.xz"; + sha256 = "02sw664fkrfpsygspq8fn4zgk8rxs9rd29nnx6nyvkji68mb51s6"; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-mars.zip"; - sha256 = "0n2dkl35qrik10wvhvkayyra987p03g56pxhz5kc73cbsl5zd96l"; + url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-mars.tar.xz"; + sha256 = "14rl3il61jyqwiqlpgbh397q3rcs7jcf2pvr2763ar5a9czmy8h6"; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet.zip"; - sha256 = "0wwmc3wj2pjg4kimfkvcsimk3s4s7l7k000vxqi8yjlfs70f273c"; + url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet.tar.xz"; + sha256 = "0rza3yxwj256ibqimymjhd6lpjzr7fkhggq0ijdg1wab3q91x66q"; }) ]; - nativeBuildInputs = [ unzip ]; - sourceRoot = "."; installPhase = '' + runHook preInstall mkdir -p $out/share/themes/ cp -a Sweet* $out/share/themes/ rm $out/share/themes/*/{LICENSE,README*} + runHook postInstall ''; meta = with stdenv.lib; { description = "Light and dark colorful Gtk3.20+ theme"; homepage = "https://github.com/EliverLara/Sweet"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ fuzen ]; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 1311bea08d43e..8f2ec6f85dd47 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "04pmjzwcy1lswkri30rnvac99dff8zajs41as0j1cqrd1058i03j"; + sha256 = "0SG7NLCLbqYB9du6Q6SxYTpuVJP8Cx4uzJDGZnEakS0="; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 026e0d2fae612..10130be57da09 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -47,13 +47,13 @@ in stdenv.mkDerivation rec { pname = "gdm"; - version = "3.38.2"; + version = "3.38.2.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1k2k3rv10y9dppp6ffz6gqi2p6s3g03bxjyy8njvcjyxqdk6d8i5"; + sha256 = "yliiBdXr/L2rVqEXFriY4Wrl3/Ia7nnQdgRkRGKOxNo="; }; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 444fcfc4f685c..d4972fb0a2917 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "3.38.0"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08sj1csd1jsmph2lyw2lpj7jh40236alz56pmf315hwyimkcwd3p"; + sha256 = "1TuF3BMDobXOHkIcH1xqwLMY4HzZqVk50uHwlZpe19k="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index 08d402ead5744..9443fc2bb8ca0 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -26,15 +26,6 @@ stdenv.mkDerivation rec { sha256 = "097dw1l92l73xah9l56ka5mi3dvx48ffpiv33ni5i5rqw0ng7fc4"; }; - patches = [ - # Fix build with Meson 0.55 - # https://gitlab.gnome.org/GNOME/iagno/-/issues/16 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/iagno/commit/0100bab269f2102f24a6e41202b931da1b6e8dc5.patch"; - sha256 = "ZW75s+bV45ivwA+SKUN7ejSvnXYEo/kYQjDVvFBA/sg="; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index a042ce134a941..b6a12fca13349 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -20,13 +20,13 @@ python3Packages.buildPythonApplication rec { pname = "gnome-tweaks"; - version = "3.34.0"; + version = "3.34.1"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0l2j42ba7v866iknygamnkiq7igh0fjvq92r93cslvvfnkx2ccq0"; + sha256 = "19y62dj4n5i6v4zpjllxl51dch6ndy8xs45v5aqmmq9xyfrqk5yq"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index b41d766c1adf2..38dfd621848ce 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "compton-conf"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1wqnajarkrpmc60jr1zw5w39lvlf9ii4ri9wgyn55hh1rkbzi7py"; + sha256 = "0gcvyn7aabdz5yj0jzv14hlgjgbm8d9ib5r73i842f0hv4cv9m0q"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 1292da151acff..088b4e335ea8e 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -107,7 +107,7 @@ let qlipper ### Default icon theme - pkgs.oxygen-icons5 + pkgs.kdeFrameworks.oxygen-icons5 ### Screen saver pkgs.xscreensaver diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index fc97906ab7d2f..fb6b759db5539 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "libfm-qt"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "libfm-qt"; rev = version; - sha256 = "1gjxml6c9m3xn094zbr9835sr4749dpxk4nc0ap9lg27qim63gx3"; + sha256 = "0b52bczqvw4brxv5fszjrl1375yid6xzjm49ns9rx1jw71422w0p"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index bd8181d57f6fc..ee915491f8574 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "liblxqt"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "01vfy7r7h0c5axlwqwsxg3pzdlaicnf2474bcq3jwk12gipvj5sd"; + sha256 = "1rp26g1ygzzy1cm7md326sv99zjz4y12pa402nlf2vrf2lzbwfmk"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index f5da7a4b2356d..f2d00a5869e4c 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "libqtxdg"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "00dzs6zc8prc0mxmvq0pmpy1qi8rysg97as7jfd0ndk5jii0nd85"; + sha256 = "0wiannhaydnbqd8ni3nflx2s4036grxs8aklcb95j88v3cgr2gck"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index 642b57fe0d75e..6f6e432ad9e6e 100644 --- a/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/libsysstat/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "libsysstat"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1dlshyv7pd7gwl55rd3msppjdpz2pwp5f4da9a9wapg7kiskqahf"; + sha256 = "1pbshhg8pjkzkka5f2rxfxal7rb4fjccpgj07kxvgcnqlah27ydk"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 22ce26526acb8..014898f5326b5 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "lximage-qt"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1pz0ird5vyrz1xycfn2vqh628f2mzwrx0psnp4hqdmj1xk9bjkbp"; + sha256 = "1z2lvfrw9shpvwxva0vf0rk74nj3mmjgxznsgq8r65645fnj5imb"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index 01365129467d4..0070d31af9a89 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "lxqt-about"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0bgwh9jbvpnsdcij0bfkgzg0pb0ljjalv65q4q0hlha430pmpv3x"; + sha256 = "0m7gan31byy80k9jqfqxx4drvfx0d9savj4shnrabsb3z3fj9h8h"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index 21a637bc66935..b3b74b92f6a9d 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-admin"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "16fbnlvla8lq6rkv5gpmkw2jj9h1wzd3jcf8sjrbns6ygyfdxx3a"; + sha256 = "0mi119ji0260idi14980nhmylx3krnfmkj9r81nmbbrg02h158nz"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 93e5ffec2a0a9..8c5c57045d973 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "lxqt-archiver"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-archiver"; rev = version; - sha256 = "1cip2dbvxbdlx1axz5sn4mwigwvfxb1q14byn09crv71adyfprw5"; + sha256 = "0f4nj598w6qhcrhbab15cpfmrda02jcflxhb15vyv7gnplalkya6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 92ce3c2fe5088..cd39096678f43 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "lxqt-build-tools"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "18l1w9lyf3nyj05wjhaj4lclak6qydlhw9bqi6kxgr1bv8k709lf"; + sha256 = "1wf6mhcfgk64isy7bk018szlm18xa3hjjnmhpcy2whnnjfq0jal6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 677b90b25c533..c50b258243ea8 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "lxqt-config"; - version = "0.15.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1nqkc716rl4c0rad4vqlqadm6lljrhwpdflaa5k9lrdiingr0s7s"; + sha256 = "1ppkkz7rg5ddlyk1ikh2s3g7nbb0wnpl0lldg9j68l76d61sfm8z"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index 59e2096dea43a..62bb75e787699 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-globalkeys"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "09vib713zbmnwicijycl3n9q35l45lrcw129lf9z95s3ch81x1hm"; + sha256 = "00n02mci0wry9l2prc98liiamshacnj8pvmra5wkmygm581q2r19"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 43f9bf3193246..520c0322eaa46 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-notificationd"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0vqk1rc4fn2s0ls6sl03vzsb16xczrxab4rzjim3azm4pwsxjd1k"; + sha256 = "0ahvjf5102a0pz5bfznjvkg55xix6k9bw381gzv6jqw5553snanc"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index a164571800ac9..cdfb51a472d53 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-openssh-askpass"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "056bj3ssp4vqapzqg3da3m95vi92043j7mv70lmpznxdwyjwgxc3"; + sha256 = "163mshrwfwp31bjis66l50krsyp184idw9gyp7pdh047psca5129"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index a0bdd9bfae611..d333bae3d304f 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -30,13 +30,13 @@ mkDerivation rec { pname = "lxqt-panel"; - version = "0.15.1"; + version = "0.16.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0f3sjzkria61nz342daxps2w57wnx6laq9iww8hha7rbi24yw2sd"; + sha256 = "1mm23fys5npm5fi47y3h2mzvlhlcaz7k1p4wwmc012f0hqcrvqik"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 7575c805a31cf..5b708d6c03637 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "lxqt-policykit"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "001zgjxgvzp7clfqr46sx8m3a7v38xxgxjqrpz01lxx18zik3d9h"; + sha256 = "05qi550cjyjzhlma4zxnp1pn8i5cgak2k2mwwh2a5gpicp5axavn"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 2b48a2a04b5a2..22eb060dfd50b 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -12,18 +12,19 @@ , kidletime , liblxqt , libqtxdg +, lxqt-globalkeys , lxqtUpdateScript }: mkDerivation rec { pname = "lxqt-powermanagement"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0gqxy4d05gibsvq27qdfwp5v19310l0ln4bvwaan6ailbyyya90f"; + sha256 = "1pf3z8hymddk1cm5j5lqgah967xsdl37j66gz5bs3dw7871gbdhy"; }; nativeBuildInputs = [ @@ -41,6 +42,7 @@ mkDerivation rec { kidletime liblxqt libqtxdg + lxqt-globalkeys ]; passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index 7bdd628f45898..5fbf9f8f56841 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-qtplugin"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0if01bdhz8ph4k1mwvjjjw0fw6mxzprgz17ap23xbsdr009hxdf0"; + sha256 = "14k5icxjkl5znp59y44791brsmwy54jkwr4vn3kg4ggqjdp3vbh9"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index 8a27ef41610e0..d99692847f641 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -20,13 +20,13 @@ mkDerivation rec { pname = "lxqt-runner"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1x6s4k27cvj2k51hwpcp3l686c2am504ckry4fm76h0mlnkffjm5"; + sha256 = "0bmx5y4l443j8vrzw8967kw5i150braq0pfj8xk0nyz6zz62rrf1"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index 2e513b23988fa..bb212cf15a79c 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "lxqt-session"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0kbk13dpmr75yd905n30k51cl7srrxz31ma4kacx450qgr5rwawn"; + sha256 = "1lmj0cx4crdjl2qih3scm2gvsx3qna0nb6mjjrcx0f2k7h744pik"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index 5f8fbcd2a6a6a..a6fef7479abf6 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "lxqt-sudo"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1j8pxqxb2c10hrfq34nfx75pc0cz6044j4w458nnxbgvl5b8cdcb"; + sha256 = "0al64v12ddi6bgrr2z86jh21c02wg5l0mxjcmk9xlsvdx0d94cdx"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index 4613017b8a96c..5ab100bd1011a 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "lxqt-themes"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1magzckhgrac2b5jm83hj3s8x4hyfnbh2v86lfa4c36whnfvsz29"; + sha256 = "12pbba7a2rk0kjn3hl2lvn90di58w0s5psbq51kz39ah3rlp9dzz"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 91baba60d8a6d..3b9891053ffa7 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "obconf-qt"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "13bah70k78kscrr01z7dwdzwhay8mz0f7gfsg2a6w113mgqkn7ib"; + sha256 = "0kk5scp1j0hqi27q3yl9cg73ybxzm22nj96pa8adhdn4shg9bpac"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 24343d4237449..dafb894791855 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "pavucontrol-qt"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0ppm79c6pkz2hvs1rri55d3s46j6r0vhiv634wzap9qshjb1j367"; + sha256 = "1d3kp2y3crrmbqak4mn9d6cfbhi5l5xhchhjh44ng8gpww22k5h0"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 599dd67828cb0..9a6085da02cf0 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "pcmanfm-qt"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "12rzcv5n4s299c8787islkn4xcjb9bbrj12mxcd5ii91jq39aii4"; + sha256 = "09mlv5qkwzpfz5l41pcz0k01kgsikzkghhfkl84hwyjdm4i2vapj"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index 7ef9db40f7c1e..fea3db315cf0d 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "qps"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0jg7sfhdm5xsahzcw8hc2vpp5p3sqzdqwp4my65nj85i7wzgxmva"; + sha256 = "0gfw7iz7jzyfl9hiq3aivbgkkl61fz319cfg57fgn2kldlcljhwa"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index c7bcf6dad3bcf..47a621d21983e 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "qterminal"; - version = "0.15.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1vna0fvdasrdx7l5zxaaxi1v9fy34g2qblgkdhpczxivnmmxm5a3"; + sha256 = "0l1jhkyx7ihv3nvqm1gfvzhrhl4l8yvqxly0c9zgl6mzrd39cj3d"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index fc3fb4a5db0eb..2517b7a444775 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "qtermwidget"; - version = "0.15.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "07wvcc650998yav9hr4hpm842j0iqdvls3mn9n2n4v8xvm7cii2m"; + sha256 = "0kpg4b60h6dads8ncwlk0zj1c8y7xpb0kz28j0v9fqjbmxja7x6w"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index 6a2e14fa50d8f..cac2ef27d72fd 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "screengrab"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "07wm9q0nkrvmyb12kvh0709qrwizlxgy6i5j2czhb4giljrpr4x6"; + sha256 = "0jy2izgl3jg6mnykpw7ji1fjv7dsivdfi6k6i6glrpa0z1p51gic"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index b5ff3f5dd05da..7500dda7e3f25 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -1,14 +1,17 @@ { - mkDerivation, extra-cmake-modules, shared-mime-info, - bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, - knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative + mkDerivation, lib, extra-cmake-modules, shared-mime-info, + qtbase, qtdeclarative, bluez-qt, + kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications, + kwidgetsaddons, kwindowsystem, plasma-framework }: mkDerivation { name = "bluedevil"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ - bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons - kdbusaddons kded kiconthemes knotifications kwidgetsaddons + qtbase qtdeclarative bluez-qt + ki18n kio kwindowsystem plasma-framework kcoreaddons kdbusaddons kded + kiconthemes knotifications kwidgetsaddons ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 39299d8c83c0c..014f794b5e83d 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -118,6 +118,7 @@ let ksysguard = callPackage ./ksysguard.nix {}; kwallet-pam = callPackage ./kwallet-pam.nix {}; kwayland-integration = callPackage ./kwayland-integration.nix {}; + kwayland-server = callPackage ./kwayland-server {}; kwin = callPackage ./kwin {}; kwrited = callPackage ./kwrited.nix {}; libkscreen = callPackage ./libkscreen {}; @@ -126,6 +127,7 @@ let oxygen = callPackage ./oxygen.nix {}; plasma-browser-integration = callPackage ./plasma-browser-integration.nix {}; plasma-desktop = callPackage ./plasma-desktop {}; + plasma-disks = callPackage ./plasma-disks.nix {}; plasma-integration = callPackage ./plasma-integration {}; plasma-nm = callPackage ./plasma-nm {}; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; @@ -137,7 +139,6 @@ let powerdevil = callPackage ./powerdevil.nix {}; sddm-kcm = callPackage ./sddm-kcm.nix {}; systemsettings = callPackage ./systemsettings.nix {}; - user-manager = callPackage ./user-manager.nix {}; xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix {}; thirdParty = let inherit (libsForQt5) callPackage; in { diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix index ccfeaa4f63e3d..37632ab2f76d3 100644 --- a/pkgs/desktops/plasma-5/discover.nix +++ b/pkgs/desktops/plasma-5/discover.nix @@ -1,14 +1,15 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, gettext, kdoctools, python, appstream-qt, discount, flatpak, fwupd, ostree, packagekit-qt, pcre, util-linux, - qtquickcontrols2, + qtbase, qtquickcontrols2, karchive, kconfig, kcrash, kdbusaddons, kdeclarative, kio, kirigami2, kitemmodels, knewstuff, kwindowsystem, kxmlgui, plasma-framework }: mkDerivation { name = "discover"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; buildInputs = [ # discount is needed for libmarkdown diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index abb5659526f71..dbc4eef057b90 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.18.5/ ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.20.4/ ) diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix index d2870c27e6597..5c856b9d39c23 100644 --- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix +++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix @@ -1,12 +1,13 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel, - kwindowsystem, kxmlgui, kcrash + kwindowsystem, kxmlgui, kcrash, qtbase }: mkDerivation { name = "kactivitymanagerd"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index c1ed6dbd6c6e6..798f8d807af13 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, wrapGAppsHook, glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio, - knewstuff, gsettings-desktop-schemas, xsettingsd + knewstuff, gsettings-desktop-schemas, xsettingsd, kdecoration, sass }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { dontWrapGApps = true; # There is nothing to wrap buildInputs = [ ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes - knewstuff gsettings-desktop-schemas xsettingsd + knewstuff gsettings-desktop-schemas xsettingsd kdecoration sass ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix index 569da3c703499..9a09ce30f4c9b 100644 --- a/pkgs/desktops/plasma-5/kdecoration.nix +++ b/pkgs/desktops/plasma-5/kdecoration.nix @@ -1,8 +1,9 @@ -{ mkDerivation, extra-cmake-modules, qtbase, ki18n }: +{ mkDerivation, lib, extra-cmake-modules, qtbase, ki18n }: mkDerivation { name = "kdecoration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ki18n ]; outputs = [ "out" "dev" ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix index ccbf3820b908c..e7cc42e77cd58 100644 --- a/pkgs/desktops/plasma-5/kgamma5.nix +++ b/pkgs/desktops/plasma-5/kgamma5.nix @@ -1,11 +1,12 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kdoctools, - kconfig, kconfigwidgets, ki18n, qtx11extras, libXxf86vm + kconfig, kconfigwidgets, ki18n, qtbase, qtx11extras, libXxf86vm }: mkDerivation { name = "kgamma5"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras libXxf86vm ]; + meta.broken = lib.versionOlder qtbase.version "5.15"; } diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index cf353af589190..c8213482d79d3 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -1,6 +1,7 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kdoctools, + qtbase, kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kirigami2, kpackage, kservice, kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils, @@ -9,6 +10,7 @@ mkDerivation { name = "kinfocenter"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix index e748121132c1b..ace14b385e6b3 100644 --- a/pkgs/desktops/plasma-5/kscreenlocker.nix +++ b/pkgs/desktops/plasma-5/kscreenlocker.nix @@ -1,13 +1,14 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kdoctools, kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime, - kwayland, libXcursor, pam, plasma-framework, qtdeclarative, qtx11extras, + kwayland, libXcursor, pam, plasma-framework, qtbase, qtdeclarative, qtx11extras, wayland, }: mkDerivation { name = "kscreenlocker"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix index 39e260f6c7082..c4dabd71343ea 100644 --- a/pkgs/desktops/plasma-5/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5/ksshaskpass.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kdoctools, kcoreaddons, ki18n, kwallet, kwidgetsaddons, qtbase, }: @@ -8,4 +8,5 @@ mkDerivation { name = "ksshaskpass"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons qtbase ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix index 72793fdf08380..0581b8bde74a1 100644 --- a/pkgs/desktops/plasma-5/ksysguard.nix +++ b/pkgs/desktops/plasma-5/ksysguard.nix @@ -1,13 +1,14 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kdoctools, libcap, libpcap, lm_sensors, kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews, - knewstuff, libksysguard + knewstuff, libksysguard, qtbase }: mkDerivation { name = "ksysguard"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix index 667d3ead17682..2e923094dc54b 100644 --- a/pkgs/desktops/plasma-5/kwayland-integration.nix +++ b/pkgs/desktops/plasma-5/kwayland-integration.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kguiaddons, kidletime, kwayland, kwindowsystem, qtbase, }: @@ -8,4 +8,5 @@ mkDerivation { name = "kwayland-integration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/pkgs/desktops/plasma-5/kwayland-server/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch b/pkgs/desktops/plasma-5/kwayland-server/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch new file mode 100644 index 0000000000000..771e093bb9e88 --- /dev/null +++ b/pkgs/desktops/plasma-5/kwayland-server/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch @@ -0,0 +1,25 @@ +From 80bca7370d4b8bafcf18abcda30f02e190f419a4 Mon Sep 17 00:00:00 2001 +From: Tom Hall <tahall256@protonmail.ch> +Date: Sat, 29 Aug 2020 19:14:30 +0100 +Subject: [PATCH] Use KDE_INSTALL_TARGETS_DEFAULT_ARGS when installing targets + +--- + src/server/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt +index 0f99682..35e3601 100644 +--- a/src/server/CMakeLists.txt ++++ b/src/server/CMakeLists.txt +@@ -356,7 +356,7 @@ set_target_properties(KWaylandServer PROPERTIES VERSION ${KWAYLANDSERVER_VERSI + SOVERSION ${KWAYLANDSERVER_SOVERSION} + ) + +-install(TARGETS KWaylandServer EXPORT KWaylandServerTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ++install(TARGETS KWaylandServer EXPORT KWaylandServerTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) + + set(SERVER_LIB_HEADERS + ${CMAKE_CURRENT_BINARY_DIR}/KWaylandServer/kwaylandserver_export.h +-- +2.26.2 + diff --git a/pkgs/desktops/plasma-5/kwayland-server/default.nix b/pkgs/desktops/plasma-5/kwayland-server/default.nix new file mode 100644 index 0000000000000..6d2a3fabff2b9 --- /dev/null +++ b/pkgs/desktops/plasma-5/kwayland-server/default.nix @@ -0,0 +1,19 @@ +{ + mkDerivation, lib, cmake, + extra-cmake-modules, kdoctools, + kwayland, plasma-wayland-protocols, + wayland, wayland-protocols, qtbase +}: + +mkDerivation { + name = "kwayland-server"; + nativeBuildInputs = [ + cmake + extra-cmake-modules #kdoctools + ]; + buildInputs = [ + kwayland plasma-wayland-protocols wayland wayland-protocols + ]; + patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; +} diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index e2fb0877ec866..f0b07fba736ef 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -11,7 +11,7 @@ breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, - kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, + kscreenlocker, kservice, kwayland, kwayland-server, kwidgetsaddons, kwindowsystem, kxmlgui, plasma-framework, libcap, libdrm, mesa }: @@ -30,18 +30,13 @@ mkDerivation { breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice - kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework + kwayland kwayland-server kwidgetsaddons kwindowsystem kxmlgui plasma-framework libcap libdrm mesa ]; - outputs = [ "bin" "dev" "out" ]; + outputs = [ "dev" "out" ]; patches = [ ./0001-follow-symlinks.patch ./0002-xwayland.patch - (fetchpatch { # included in >= 5.18.6 - name = "EGL_TEXTURE_Y_XUXV_WL.diff"; - url = "https://github.com/KDE/kwin/commit/2c76cc478.diff"; - sha256 = "1ywaky05h5j1x758q3yhp3ap45ispffghyxynqz5lybl5n6yyxhy"; - }) ]; CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix index f6f6187e94623..e6ee4829bcbf5 100644 --- a/pkgs/desktops/plasma-5/kwrited.nix +++ b/pkgs/desktops/plasma-5/kwrited.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kcoreaddons, kdbusaddons, ki18n, knotifications, kpty, qtbase, }: @@ -8,4 +8,5 @@ mkDerivation { name = "kwrited"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kdbusaddons ki18n knotifications kpty qtbase ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix index db952944ecaa6..08a9e6f4f24b1 100644 --- a/pkgs/desktops/plasma-5/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -7,7 +7,7 @@ mkDerivation { name = "libkscreen"; meta = { - broken = builtins.compareVersions qtbase.version "5.12.0" < 0; + broken = lib.versionOlder qtbase.version "5.15.0"; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kwayland libXrandr qtx11extras ]; diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index 96d113e11fb62..8178d40795008 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -1,13 +1,14 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes, - kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebengine, - qtx11extras + knewstuff, kservice, kwidgetsaddons, kwindowsystem, plasma-framework, + qtbase, qtscript, qtwebengine, qtx11extras }: mkDerivation { name = "libksysguard"; + meta.broken = lib.versionOlder qtbase.version "5.14.0"; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; @@ -15,7 +16,7 @@ mkDerivation { buildInputs = [ kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras - qtwebengine + qtwebengine knewstuff ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix index 790979d664fc7..ab23703a470b2 100644 --- a/pkgs/desktops/plasma-5/milou.nix +++ b/pkgs/desktops/plasma-5/milou.nix @@ -1,12 +1,13 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kcoreaddons, kdeclarative, ki18n, kitemmodels, krunner, kservice, - plasma-framework, qtscript, qtdeclarative + plasma-framework, qtbase, qtscript, qtdeclarative }: mkDerivation { name = "milou"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix index 1b1f34f17b53e..6eea3c923197a 100644 --- a/pkgs/desktops/plasma-5/oxygen.nix +++ b/pkgs/desktops/plasma-5/oxygen.nix @@ -3,7 +3,7 @@ extra-cmake-modules, frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons, ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtdeclarative, - qtx11extras + qtx11extras, libXdmcp }: mkDerivation { @@ -12,7 +12,7 @@ mkDerivation { propagatedBuildInputs = [ frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative - qtx11extras + qtx11extras libXdmcp ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 73e449a13624a..a07a50f04927b 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -19,7 +19,7 @@ mkDerivation { name = "plasma-desktop"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft + boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver libxkbfile phonon xf86inputevdev xf86inputsynaptics xinput xkeyboard_config qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras @@ -35,7 +35,7 @@ mkDerivation { ./tzdir.patch ]; postPatch = '' - sed '1i#include <cmath>' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp + sed '1i#include <cmath>' -i kcms/touchpad/backends/x11/synapticstouchpad.cpp ''; CXXFLAGS = [ "-I${lib.getDev xorgserver}/include/xorg" diff --git a/pkgs/desktops/plasma-5/plasma-disks.nix b/pkgs/desktops/plasma-5/plasma-disks.nix new file mode 100644 index 0000000000000..f97b061292a52 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-disks.nix @@ -0,0 +1,19 @@ +{ + mkDerivation, extra-cmake-modules, kdoctools, + kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, + kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2, + kactivities, kactivities-stats, kirigami2, kcrash, plasma-workspace, + systemsettings +}: + +mkDerivation { + name = "plasma-disks"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice + kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 + kactivities kactivities-stats kirigami2 kcrash plasma-workspace + systemsettings + ]; + outputs = [ "bin" "dev" "out" ]; +} diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index 8296d549782f4..31fd355895771 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -1,15 +1,17 @@ { - mkDerivation, substituteAll, + mkDerivation, lib, substituteAll, extra-cmake-modules, kdoctools, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, mobile-broadband-provider-info, modemmanager-qt, networkmanager-qt, - openconnect, openvpn, plasma-framework, qca-qt5, qtdeclarative, qttools, solid + openconnect, openvpn, plasma-framework, qca-qt5, qtbase, qtdeclarative, + qttools, solid }: mkDerivation { name = "plasma-nm"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ]; buildInputs = [ kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index e29df104f3c72..00f5fefdc4348 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -1,8 +1,8 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, kwindowsystem, plasma-framework, - qtdeclarative, + qtbase, qtdeclarative, gconf, glib, libcanberra-gtk3, libpulseaudio, sound-theme-freedesktop }: @@ -15,6 +15,7 @@ mkDerivation { kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n plasma-framework kwindowsystem - qtdeclarative + qtbase qtdeclarative ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch index 1208009262966..ea8afedbe5ba7 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch @@ -1,19 +1,33 @@ -From 6477e377fcca39c07ef5f91a55084d7d74715d00 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@mailbox.org> -Date: Tue, 28 Jan 2020 05:00:53 -0600 -Subject: [PATCH 1/2] startkde +From d653bc84c8aed33072237ed858194a8a73b6a2e7 Mon Sep 17 00:00:00 2001 +From: Tom Hall <tahall256@protonmail.ch> +Date: Mon, 7 Sep 2020 18:09:52 +0100 +Subject: [PATCH] startkde --- + startkde/plasma-session/startup.cpp | 2 +- startkde/startplasma-waylandsession.cpp | 2 +- startkde/startplasma-x11.cpp | 2 +- - startkde/startplasma.cpp | 24 ++++++++++-------------- - 3 files changed, 12 insertions(+), 16 deletions(-) + startkde/startplasma.cpp | 22 +++++++++------------- + 4 files changed, 12 insertions(+), 16 deletions(-) +diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp +index 89cc144ba..8ca9e81d2 100644 +--- a/startkde/plasma-session/startup.cpp ++++ b/startkde/plasma-session/startup.cpp +@@ -211,7 +211,7 @@ Startup::Startup(QObject *parent): + upAndRunning(QStringLiteral("ksmserver")); + const AutoStart autostart; + +- QProcess::execute(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), QStringList()); ++ QProcess::execute(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), QStringList()); + + KJob* phase1; + QProcessEnvironment kdedProcessEnv; diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp -index 87c71c6b3..5fc53140e 100644 +index f59654d18..5e3a93db0 100644 --- a/startkde/startplasma-waylandsession.cpp +++ b/startkde/startplasma-waylandsession.cpp -@@ -67,7 +67,7 @@ int main(int /*argc*/, char** /*argv*/) +@@ -61,7 +61,7 @@ int main(int argc, char** argv) waitForKonqi(); out << "startplasma-waylandsession: Shutting down...\n"; @@ -23,10 +37,10 @@ index 87c71c6b3..5fc53140e 100644 cleanupX11(); out << "startplasma-waylandsession: Done.\n"; diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp -index 3314b6283..14cbe29fa 100644 +index ae1c4d101..0df24b5be 100644 --- a/startkde/startplasma-x11.cpp +++ b/startkde/startplasma-x11.cpp -@@ -111,7 +111,7 @@ int main(int /*argc*/, char** /*argv*/) +@@ -110,7 +110,7 @@ int main(int argc, char** argv) out << "startkde: Shutting down...\n"; @@ -36,10 +50,10 @@ index 3314b6283..14cbe29fa 100644 cleanupPlasmaEnvironment(); cleanupX11(); diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp -index 4c9f5cef6..5ea4c2cf1 100644 +index a055d5635..62afb1513 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp -@@ -34,7 +34,7 @@ QTextStream out(stderr); +@@ -41,7 +41,7 @@ QTextStream out(stderr); void messageBox(const QString &text) { out << text; @@ -48,7 +62,7 @@ index 4c9f5cef6..5ea4c2cf1 100644 } QStringList allServices(const QLatin1String& prefix) -@@ -242,15 +242,15 @@ void setupX11() +@@ -262,15 +262,15 @@ void setupX11() // If the user has overwritten fonts, the cursor font may be different now // so don't move this up. @@ -69,20 +83,7 @@ index 4c9f5cef6..5ea4c2cf1 100644 } // TODO: Check if Necessary -@@ -267,11 +267,7 @@ bool syncDBusEnvironment() - { - int exitCode; - // At this point all environment variables are set, let's send it to the DBus session server to update the activation environment -- if (!QStandardPaths::findExecutable(QStringLiteral("dbus-update-activation-environment")).isEmpty()) { -- exitCode = runSync(QStringLiteral("dbus-update-activation-environment"), { QStringLiteral("--systemd"), QStringLiteral("--all") }); -- } else { -- exitCode = runSync(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR "/ksyncdbusenv"), {}); -- } -+ exitCode = runSync(QStringLiteral(NIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT), { QStringLiteral("--systemd"), QStringLiteral("--all") }); - return exitCode == 0; - } - -@@ -287,7 +283,7 @@ void setupFontDpi() +@@ -306,7 +302,7 @@ void setupFontDpi() //TODO port to c++? const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0)); QProcess p; @@ -91,7 +92,7 @@ index 4c9f5cef6..5ea4c2cf1 100644 p.setProcessChannelMode(QProcess::ForwardedChannels); p.write(input); p.closeWriteChannel(); -@@ -309,7 +305,7 @@ QProcess* setupKSplash() +@@ -328,7 +324,7 @@ QProcess* setupKSplash() KConfigGroup ksplashCfg = cfg.group("KSplash"); if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { p = new QProcess; @@ -100,15 +101,6 @@ index 4c9f5cef6..5ea4c2cf1 100644 } } return p; -@@ -331,7 +327,7 @@ bool startKDEInit() - { - // We set LD_BIND_NOW to increase the efficiency of kdeinit. - // kdeinit unsets this variable before loading applications. -- const int exitCode = runSync(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), { QStringLiteral("--kded"), QStringLiteral("+kcminit_startup") }, { QStringLiteral("LD_BIND_NOW=true") }); -+ const int exitCode = runSync(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), { QStringLiteral("--kded"), QStringLiteral("+kcminit_startup") }, { QStringLiteral("LD_BIND_NOW=true") }); - if (exitCode != 0) { - messageBox(QStringLiteral("startkde: Could not start kdeinit5. Check your installation.")); - return false; -- -2.25.1 +2.28.0 diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 6472856cd9b76..e1becaab95b6b 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -4,7 +4,7 @@ extra-cmake-modules, kdoctools, coreutils, dbus, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor, - libXtst, pam, wayland, xmessage, xprop, xrdb, xsetroot, + libXtst, libXft, pam, wayland, xmessage, xprop, xrdb, xsetroot, baloo, breeze-qt5, kactivities, kactivities-stats, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime, @@ -12,7 +12,7 @@ kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt, phonon, plasma-framework, prison, solid, kholidays, kquickcharts, - appstream-qt, + appstream-qt, plasma-wayland-protocols, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, qtwayland, qtx11extras, qqc2-desktop-style, @@ -25,14 +25,14 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - isocodes libdbusmenu libSM libXcursor libXtst pam wayland + isocodes libdbusmenu libSM libXcursor libXtst libXft pam wayland baloo kactivities kactivities-stats kcmutils kconfig kcrash kdbusaddons kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard libqalculate networkmanager-qt phonon plasma-framework prison solid - kholidays kquickcharts appstream-qt + kholidays kquickcharts appstream-qt plasma-wayland-protocols qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras qqc2-desktop-style diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix index c25b3d2744b71..27f03e2d931e2 100644 --- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix @@ -1,7 +1,7 @@ { - mkDerivation, extra-cmake-modules, + mkDerivation, lib, extra-cmake-modules, kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications, - kwidgetsaddons, kwindowsystem, polkit-qt + kwidgetsaddons, kwindowsystem, polkit-qt, qtbase }: mkDerivation { @@ -12,4 +12,5 @@ mkDerivation { knotifications kwindowsystem polkit-qt ]; outputs = [ "out" "dev" ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index 979d69a02f619..28e6db853a16b 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -19,18 +19,10 @@ mkDerivation { "-DHAVE_DDCUTIL=On" ]; patches = [ - # This fixes an issue where 'DDCA_Feature_List*' cannot be converted to - # 'DDCA_Feature_List'. - # https://bugs.kde.org/show_bug.cgi?id=423605 - (fetchpatch { - url = "https://invent.kde.org/plasma/powerdevil/-/commit/fcb26be2fb279e6ad3b7b814d26a5921d16201eb.patch"; - sha256 = "0gdyaa0nd1c1d6x2h0m933lascm8zm5sikd99wxmkf7hhaby6k2s"; - }) - # Reduce log message spam by setting the default log level to Warning. - (fetchpatch { - url = "https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch"; - sha256 = "077whhi0jrb3bajx357k7n66hv7nchis8jix0nfc1zjvi9fm6pi2"; - }) + #(fetchpatch { + # url = "https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch"; + # sha256 = "077whhi0jrb3bajx357k7n66hv7nchis8jix0nfc1zjvi9fm6pi2"; + #}) ]; } diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix index 6becf3bf420b7..a9f51e50a2682 100644 --- a/pkgs/desktops/plasma-5/sddm-kcm.nix +++ b/pkgs/desktops/plasma-5/sddm-kcm.nix @@ -1,12 +1,13 @@ { - mkDerivation, extra-cmake-modules, shared-mime-info, + mkDerivation, lib, extra-cmake-modules, shared-mime-info, libpthreadstubs, libXcursor, libXdmcp, - qtquickcontrols2, qtx11extras, + qtbase, qtquickcontrols2, qtx11extras, karchive, ki18n, kio, knewstuff }: mkDerivation { name = "sddm-kcm"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ libpthreadstubs libXcursor libXdmcp diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 6f9214ccd60c2..ecca8c5bfdde4 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -1,390 +1,398 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5 +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5/ { fetchurl, mirror }: { bluedevil = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/bluedevil-5.18.5.tar.xz"; - sha256 = "5350efbaee01c78fd451e96bb2aceb7986d45ab05500476d1e95c4e79ec89a66"; - name = "bluedevil-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/bluedevil-5.20.4.tar.xz"; + sha256 = "522ad4ff3f3fc4e213328f821041d40b5126d0d3ca49ecc9aea35c59e2c64129"; + name = "bluedevil-5.20.4.tar.xz"; }; }; breeze = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/breeze-5.18.5.tar.xz"; - sha256 = "1d08dfd24df4a4fcacad1e3759e559e82f6014ba63dc75dc32a24de6cd133563"; - name = "breeze-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/breeze-5.20.4.tar.xz"; + sha256 = "b61b3f9961c196bbcfb33519bbec06d19e6267182f7215e21071a5619681b30f"; + name = "breeze-5.20.4.tar.xz"; }; }; breeze-grub = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/breeze-grub-5.18.5.tar.xz"; - sha256 = "24c40171601b82d1c7d01eb85d16718a2f46cf23ee792f5524ac89fda3d278b1"; - name = "breeze-grub-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/breeze-grub-5.20.4.tar.xz"; + sha256 = "8692b6800e89b97973b50d6915f9ca028cdcb0354c34b54719af54441e3f3feb"; + name = "breeze-grub-5.20.4.tar.xz"; }; }; breeze-gtk = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/breeze-gtk-5.18.5.tar.xz"; - sha256 = "41c7e83a28c033903d4fcab3da28a4c74ddb72958e66693a2d2e451f716cb7e9"; - name = "breeze-gtk-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/breeze-gtk-5.20.4.tar.xz"; + sha256 = "8905b3a0ff40a48ed2f00f69b7e30c4658deb9fbd1afc61700a28d078693b61d"; + name = "breeze-gtk-5.20.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/breeze-plymouth-5.18.5.tar.xz"; - sha256 = "c0d48dc5a02f3236ff657f86ee8cf532cf885a0e8b36bfe79f007e4d5e277281"; - name = "breeze-plymouth-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/breeze-plymouth-5.20.4.tar.xz"; + sha256 = "879d4bd8d0c42a5c1f51497a4ee4ebb3e69f7904170bafa392b95e1c0ce05ada"; + name = "breeze-plymouth-5.20.4.tar.xz"; }; }; discover = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/discover-5.18.5.tar.xz"; - sha256 = "d5ce4f4668c50ba9be37e04227db4bbe469e00470c87907f1e217fdcad6e76b6"; - name = "discover-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/discover-5.20.4.tar.xz"; + sha256 = "3669648fa39e14a8da059373c9a01caacfd5b126d61daed65d5d7aae7ab30012"; + name = "discover-5.20.4.tar.xz"; }; }; drkonqi = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/drkonqi-5.18.5.tar.xz"; - sha256 = "b1a626c4ed2f9de8f8bc3359d8827e7fa6ac17486b8477674e47627fcf6efad1"; - name = "drkonqi-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/drkonqi-5.20.4.tar.xz"; + sha256 = "55d4a166ee74c4a935c69cec64ecd8eb3fdd79aae8dcd996f6432a873be3fac8"; + name = "drkonqi-5.20.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kactivitymanagerd-5.18.5.tar.xz"; - sha256 = "24f32eb4585d427ee62e08a9fa2f057353085c62644d6bec8fb4b2568e507ac7"; - name = "kactivitymanagerd-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kactivitymanagerd-5.20.4.tar.xz"; + sha256 = "210215dd9a49fda98febb60f73f4cc95eda3eb9ec96c0db2f2881f6be13afb34"; + name = "kactivitymanagerd-5.20.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kde-cli-tools-5.18.5.tar.xz"; - sha256 = "e3981d1a17111f4e284b787a6e841d7ff47f4fdbca0ad17e105c0a047e5aaaa8"; - name = "kde-cli-tools-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kde-cli-tools-5.20.4.tar.xz"; + sha256 = "55f35158715bafdd51e448a2760327ed4f91c54fcd3da807dec2736d077b16a3"; + name = "kde-cli-tools-5.20.4.tar.xz"; }; }; kdecoration = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kdecoration-5.18.5.tar.xz"; - sha256 = "f09856245f2cb08d9013da4c3128b5438f1e2f58af40031eb547ae765f57a9c8"; - name = "kdecoration-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kdecoration-5.20.4.tar.xz"; + sha256 = "8d1224a50a2e8c0ec24faab4453432eb8083b35a63e479523de95dce644226e8"; + name = "kdecoration-5.20.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kde-gtk-config-5.18.5.tar.xz"; - sha256 = "9d7b1fd8b61f9f99c5a5721ea0227c4562588834a4886d66637f4c092f0e53ab"; - name = "kde-gtk-config-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kde-gtk-config-5.20.4.tar.xz"; + sha256 = "db3510cb08788c915be5e034106145597de5a412236b60c57b8db4b64dbbd7b1"; + name = "kde-gtk-config-5.20.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kdeplasma-addons-5.18.5.tar.xz"; - sha256 = "1d135a32a7442f79dba4cb4e23221cd2ad1aad36b54fb12bfa91918daf3ff53f"; - name = "kdeplasma-addons-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kdeplasma-addons-5.20.4.tar.xz"; + sha256 = "44768c7fb00386bc4f005c773bca59d8acc354f8a3f43efa6565cefc74d490d7"; + name = "kdeplasma-addons-5.20.4.tar.xz"; }; }; kgamma5 = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kgamma5-5.18.5.tar.xz"; - sha256 = "3aa89e361646214fb4910409644b941c83a85505d3d8a1d37984598d3e54269f"; - name = "kgamma5-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kgamma5-5.20.4.tar.xz"; + sha256 = "59b1247dfc3c45247cff62e3706b52c9a1be2cf9cfe6e92c9c7299fc5cb51b41"; + name = "kgamma5-5.20.4.tar.xz"; }; }; khotkeys = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/khotkeys-5.18.5.tar.xz"; - sha256 = "8f02fdf3bbecdc31c305c276fe2b3b2eca6dc10195e65c723ee9148fed81e766"; - name = "khotkeys-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/khotkeys-5.20.4.tar.xz"; + sha256 = "13c7e5a38f095056c6411b8dc91fc0640256c0a6f0a5166ba716e2454388d648"; + name = "khotkeys-5.20.4.tar.xz"; }; }; kinfocenter = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kinfocenter-5.18.5.tar.xz"; - sha256 = "a9679bce4cd2d64e6f471c89de6da410237263b02512768f3acd0a4932b12ec5"; - name = "kinfocenter-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kinfocenter-5.20.4.tar.xz"; + sha256 = "09af2cafde33d0c8a824451ca532a443b6f571e20037fe6b31245c9984e9a6b3"; + name = "kinfocenter-5.20.4.tar.xz"; }; }; kmenuedit = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kmenuedit-5.18.5.tar.xz"; - sha256 = "59d998972121662d2835d43ff5be36eca7bf62e66e39fd67b7005e8ef8afd5f6"; - name = "kmenuedit-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kmenuedit-5.20.4.tar.xz"; + sha256 = "32c2d2eb979e43e4cc0892aa9460eb8ebaf603b77385b9f058a48ca4347dde4b"; + name = "kmenuedit-5.20.4.tar.xz"; }; }; kscreen = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kscreen-5.18.5.tar.xz"; - sha256 = "9b6238447a4a38babdff482724ae3d33786b211e8b4224aaadafaad7435f6ba2"; - name = "kscreen-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kscreen-5.20.4.tar.xz"; + sha256 = "4063fae5cb40a22a98fd0cc217e9b0ea4aef6518203c4bbe2664d5d01dfb9d9c"; + name = "kscreen-5.20.4.tar.xz"; }; }; kscreenlocker = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kscreenlocker-5.18.5.tar.xz"; - sha256 = "b4269cd027e1fee721760a22ca5d738d3d98622fa222fcf9e57d2da77a4e18d2"; - name = "kscreenlocker-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kscreenlocker-5.20.4.tar.xz"; + sha256 = "d80d4625a0a48a7a63c5ff8255e8639eb2fb57ebc436c46979949b39fc530126"; + name = "kscreenlocker-5.20.4.tar.xz"; }; }; ksshaskpass = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/ksshaskpass-5.18.5.tar.xz"; - sha256 = "c483c17d6ce2e3dffd54fc812f97b88c32f5def6e8c5e7a526e23f5e7f208cc5"; - name = "ksshaskpass-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/ksshaskpass-5.20.4.tar.xz"; + sha256 = "a391ba0490ca41a33207adb6aff2233165d4aeed119fd056489d6eccfc81f218"; + name = "ksshaskpass-5.20.4.tar.xz"; }; }; ksysguard = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/ksysguard-5.18.5.tar.xz"; - sha256 = "4acb352698b612a21a5eccf22042ab46265d50bbf3aa85844bbca762a64c9e2f"; - name = "ksysguard-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/ksysguard-5.20.4.tar.xz"; + sha256 = "a5f247b24ce75a28f301446fbeb25abf968e77e0c32cd4be9b574a21d3bbfaf4"; + name = "ksysguard-5.20.4.tar.xz"; }; }; kwallet-pam = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kwallet-pam-5.18.5.tar.xz"; - sha256 = "bc4fe3dde503645d6233c3932d3cf74a7f5bf7acefb96bd6dbd224c8919d841a"; - name = "kwallet-pam-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kwallet-pam-5.20.4.tar.xz"; + sha256 = "0749056e9acbbc194b20be5b0921383013ed6c268c22cf905aeeda32514d3ac9"; + name = "kwallet-pam-5.20.4.tar.xz"; }; }; kwayland-integration = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kwayland-integration-5.18.5.tar.xz"; - sha256 = "82d6943d79a9a2a9bce10623adb2c9af396a2dcf258a723bb349aafbde20e6d5"; - name = "kwayland-integration-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kwayland-integration-5.20.4.tar.xz"; + sha256 = "2dd985dd8d21cdc7743b9f297d0d582f960339b4714953564f2f047d28cee53d"; + name = "kwayland-integration-5.20.4.tar.xz"; + }; + }; + kwayland-server = { + version = "5.20.4"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.20.4/kwayland-server-5.20.4.tar.xz"; + sha256 = "3edc7b73baa6fa8b0bec51272e8786bab41998b0f675262d5086fdf6c1e9bb44"; + name = "kwayland-server-5.20.4.tar.xz"; }; }; kwin = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kwin-5.18.5.tar.xz"; - sha256 = "ca39c63fd740432e95490031fd9d5ac003da034582014fa41c2be2b89627ddf8"; - name = "kwin-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kwin-5.20.4.tar.xz"; + sha256 = "c59861e9d456974bffaff2cb371cd8d31bdb789f89a60af632089c556111662a"; + name = "kwin-5.20.4.tar.xz"; }; }; kwrited = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kwrited-5.18.5.tar.xz"; - sha256 = "45ffa31d3d141ce453fb09fd823d7edd8e6c782b353bce22b8c879ad794fd1fe"; - name = "kwrited-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kwrited-5.20.4.tar.xz"; + sha256 = "f02b900538246f4df2707585052b732552d2ea115a16f8fbda618fa02e5a1bb2"; + name = "kwrited-5.20.4.tar.xz"; }; }; libkscreen = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/libkscreen-5.18.5.tar.xz"; - sha256 = "a962319000324200ec1abe3c58b1b8ab71ed4cc7c88a3c7e03a1c8eca86c287c"; - name = "libkscreen-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/libkscreen-5.20.4.tar.xz"; + sha256 = "ce1bd03a25b101793fa1472ac3fc696079e607a6f45330ea724845bda288d28d"; + name = "libkscreen-5.20.4.tar.xz"; }; }; libksysguard = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/libksysguard-5.18.5.tar.xz"; - sha256 = "d4d7030a2869a546a211844aa158dcef3598386cc035a8655529938ba102440b"; - name = "libksysguard-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/libksysguard-5.20.4.tar.xz"; + sha256 = "a89968476cb8a888550e1a5138ab8e86eeb49788187192cba71f79abd4aad422"; + name = "libksysguard-5.20.4.tar.xz"; }; }; milou = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/milou-5.18.5.tar.xz"; - sha256 = "7ec763833c025aa719d1e25f3c5c1c8b6c934a48bf346517e94660e09d8582b2"; - name = "milou-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/milou-5.20.4.tar.xz"; + sha256 = "123ac9470a94f2eb6e4212979d2df4160fa15962b1fc18551bfcdfe5aa18a201"; + name = "milou-5.20.4.tar.xz"; }; }; oxygen = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/oxygen-5.18.5.tar.xz"; - sha256 = "479bdfa80b3f2216075470ab4be1e3159a17620870acf276144b9639134609f8"; - name = "oxygen-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/oxygen-5.20.4.tar.xz"; + sha256 = "e58cb6a2e1976a973e24d974556e6306a076ce1295f33a9a1bc56a8715857f67"; + name = "oxygen-5.20.4.tar.xz"; }; }; plasma-browser-integration = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-browser-integration-5.18.5.tar.xz"; - sha256 = "3a087a836657b5304e2e0ef9ebefb84ce1f896bfbfc5dbf948d4b3eb7b709383"; - name = "plasma-browser-integration-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-browser-integration-5.20.4.tar.xz"; + sha256 = "55057e4f15a1e8b2d2f0489d32f95bb89f610ae99184b587ba90f7db0e8292b4"; + name = "plasma-browser-integration-5.20.4.tar.xz"; }; }; plasma-desktop = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-desktop-5.18.5.tar.xz"; - sha256 = "aeb106018fd90da79c8a3c444d880282846a842029b1223e7830db2d4b42df9f"; - name = "plasma-desktop-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-desktop-5.20.4.tar.xz"; + sha256 = "3864e80bb9b8da596188162b14cd9bb77e7a8abedfb0fa41c8c72d47139d1355"; + name = "plasma-desktop-5.20.4.tar.xz"; + }; + }; + plasma-disks = { + version = "5.20.4"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.20.4/plasma-disks-5.20.4.tar.xz"; + sha256 = "f0110588b2603905962beedd596cfa6eb6371b7bac2186aa845d22237199d845"; + name = "plasma-disks-5.20.4.tar.xz"; }; }; plasma-integration = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-integration-5.18.5.tar.xz"; - sha256 = "c99b987efb2ab965cc2a55793ef94c7ccb2152ca5d75956a40ec99261ad4b870"; - name = "plasma-integration-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-integration-5.20.4.tar.xz"; + sha256 = "4dbaf6a05d69df02e73c88970be3d7a1efb62a3931edf06c9760cd3bb87e1299"; + name = "plasma-integration-5.20.4.tar.xz"; }; }; plasma-nano = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-nano-5.18.5.tar.xz"; - sha256 = "d2f29b05894573517cb3336088e102d3604b1c2735e9bbe605119f559f0c6341"; - name = "plasma-nano-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-nano-5.20.4.tar.xz"; + sha256 = "8e23e0ce53654daf4ab688edd6a7852b5d859bfd86b4e1795a60f570dda409bd"; + name = "plasma-nano-5.20.4.tar.xz"; }; }; plasma-nm = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-nm-5.18.5.tar.xz"; - sha256 = "1e091d01993708220f89501bb8a289279bf527d0593fd9e4b9223e6e8caf9aaa"; - name = "plasma-nm-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-nm-5.20.4.tar.xz"; + sha256 = "7b4d1026f2caa709a9ae284cd18342d1c573276f9b4c356ef47779dadb8b57cf"; + name = "plasma-nm-5.20.4.tar.xz"; }; }; plasma-pa = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-pa-5.18.5.tar.xz"; - sha256 = "28765c07f584e7688a85c9761155e606440936de2ebb678917dac2c85f5d0209"; - name = "plasma-pa-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-pa-5.20.4.tar.xz"; + sha256 = "56fb4809966aa33290c46fed968f2c7186c415663f032c75b3279c57134674f3"; + name = "plasma-pa-5.20.4.tar.xz"; }; }; plasma-phone-components = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-phone-components-5.18.5.tar.xz"; - sha256 = "d0c091367ae07c71457a0c03d1023ac48d8665385a6a1b0e32f6ae7ad1fa7070"; - name = "plasma-phone-components-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-phone-components-5.20.4.tar.xz"; + sha256 = "80053324bfb6431946df67e712638f797c2bcd9cb78766629a0372de7f6f727e"; + name = "plasma-phone-components-5.20.4.tar.xz"; }; }; plasma-sdk = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-sdk-5.18.5.tar.xz"; - sha256 = "5f399231d16d62f9880f953891477f74e0b1f7b931448a4b0fbb97f37acd2fe5"; - name = "plasma-sdk-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-sdk-5.20.4.tar.xz"; + sha256 = "49d29c1c95832c585ea3c0b26f8fb46f5fa0fac726f9f7e9cbf0ab83415a00ea"; + name = "plasma-sdk-5.20.4.tar.xz"; }; }; plasma-tests = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-tests-5.18.5.tar.xz"; - sha256 = "3251ea30cb3c62de9bba2deb152370ea9e0e56b7506efd655888f1892c18413a"; - name = "plasma-tests-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-tests-5.20.4.tar.xz"; + sha256 = "35234da922aad986db73ca4d2ca1c0440dbff24e200b98584246b060cc7a2735"; + name = "plasma-tests-5.20.4.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-thunderbolt-5.18.5.tar.xz"; - sha256 = "c61dc7abe350ead15ca4d6111606aaf19773c38a0307ae8a7d8a7c60b82be5d1"; - name = "plasma-thunderbolt-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-thunderbolt-5.20.4.tar.xz"; + sha256 = "7c37c66815242b5d1e208df3b4dbf4fe0d8542ac9aa352d06c548fc172348429"; + name = "plasma-thunderbolt-5.20.4.tar.xz"; }; }; plasma-vault = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-vault-5.18.5.tar.xz"; - sha256 = "cae2713823e8c59c7a2beb96d362a15024fe260cf10419ba037e8a798f3c1b41"; - name = "plasma-vault-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-vault-5.20.4.tar.xz"; + sha256 = "525226a143e6bb173e8106ed2f2313a529ed380a0a1488b096a60af6d08d881c"; + name = "plasma-vault-5.20.4.tar.xz"; }; }; plasma-workspace = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-workspace-5.18.5.tar.xz"; - sha256 = "14e82033be745f4db46a70d319e2c86012295ea31056092bc974004189b92354"; - name = "plasma-workspace-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-workspace-5.20.4.tar.xz"; + sha256 = "12bfe6c3f62e4d1d2f7bc02ccb2e2ed5aee2ffe21c310987e42a2205374c30c9"; + name = "plasma-workspace-5.20.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-workspace-wallpapers-5.18.5.tar.xz"; - sha256 = "f8da3bd7b97a9944639ed0860303b8a7a008905246313e1983367810a3a84d6d"; - name = "plasma-workspace-wallpapers-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-workspace-wallpapers-5.20.4.tar.xz"; + sha256 = "4740d67e85910ed398c048916963f31c6632698d6a4494bc09cc1b0cd14e2808"; + name = "plasma-workspace-wallpapers-5.20.4.tar.xz"; }; }; plymouth-kcm = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plymouth-kcm-5.18.5.tar.xz"; - sha256 = "e8f75dd8c8a45cd706a0a6e62826d1eb4fff9c3912cbaadba8c06e9de915d2e3"; - name = "plymouth-kcm-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plymouth-kcm-5.20.4.tar.xz"; + sha256 = "0cde268064c92b89c5b2a5f8c033983d372406656d446f52b77611effd67ad77"; + name = "plymouth-kcm-5.20.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.18.5"; + version = "1-5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/polkit-kde-agent-1-5.18.5.tar.xz"; - sha256 = "5e1733cb51c826c6215da4fbbc9c9568240275cf86b9922cd7a643d192a75a91"; - name = "polkit-kde-agent-1-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/polkit-kde-agent-1-5.20.4.tar.xz"; + sha256 = "f01a7b3443553810b0c9e6f25d2ca51eeac7c5e9fd624505852e77183e294b61"; + name = "polkit-kde-agent-1-5.20.4.tar.xz"; }; }; powerdevil = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/powerdevil-5.18.5.tar.xz"; - sha256 = "e000185ee61bff81fe28896a7d6353746c82c7f4d2626792fd22d34b5f49f548"; - name = "powerdevil-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/powerdevil-5.20.4.tar.xz"; + sha256 = "864128ea9178701bc322f728402cf9277b3c6feaa15fe425aa2adf92464bd28d"; + name = "powerdevil-5.20.4.tar.xz"; }; }; sddm-kcm = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/sddm-kcm-5.18.5.tar.xz"; - sha256 = "cc99c185d701acc7442f33ef17b2396894dcf164f3f583c25105ac3f2528c33b"; - name = "sddm-kcm-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/sddm-kcm-5.20.4.tar.xz"; + sha256 = "c61e136c10b98a91e1bd48ca5bbdd2a15b197a38b83d7ad5ccd289200524935e"; + name = "sddm-kcm-5.20.4.tar.xz"; }; }; systemsettings = { - version = "5.18.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/systemsettings-5.18.5.tar.xz"; - sha256 = "cde5b714261aaa54f937887657c3d3e74814c5447448b989159ee6035be4783b"; - name = "systemsettings-5.18.5.tar.xz"; - }; - }; - user-manager = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/user-manager-5.18.5.tar.xz"; - sha256 = "741d293947fa3fb3966f047bab121597bf1071be010684daff4a91626cf54484"; - name = "user-manager-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/systemsettings-5.20.4.tar.xz"; + sha256 = "e87eedfb40a0255348cf2a775ca0ea15bbce37687eedd521f2200670315953b9"; + name = "systemsettings-5.20.4.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.18.5"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/xdg-desktop-portal-kde-5.18.5.tar.xz"; - sha256 = "807452708a0318b8e21b43f9ec7e016d1de51cac5d8714d70c577bb6f3976224"; - name = "xdg-desktop-portal-kde-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/xdg-desktop-portal-kde-5.20.4.tar.xz"; + sha256 = "cb3d856f7caeae7bd02a3e9e43f12ee3d432aa399df9d40db0636199b7ed4df8"; + name = "xdg-desktop-portal-kde-5.20.4.tar.xz"; }; }; } diff --git a/pkgs/desktops/plasma-5/user-manager.nix b/pkgs/desktops/plasma-5/user-manager.nix deleted file mode 100644 index f46792fc48f76..0000000000000 --- a/pkgs/desktops/plasma-5/user-manager.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kconfig, khtml, - ki18n, kiconthemes, kio, kwindowsystem, libpwquality -}: - -mkDerivation { - name = "user-manager"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcmutils kconfig khtml ki18n kiconthemes kio kwindowsystem - libpwquality - ]; -} diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index c03c6a891614b..2b0450928f5a6 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -1,18 +1,20 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, gettext, kdoctools, python, - cups, epoxy, mesa, pcre, pipewire, + cups, epoxy, mesa, pcre, pipewire, wayland, wayland-protocols, kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, - kirigami2, kdeclarative, plasma-framework, kio + kirigami2, kdeclarative, plasma-framework, plasma-wayland-protocols, kio, + qtbase }: mkDerivation { name = "xdg-desktop-portal-kde"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; buildInputs = [ - cups epoxy mesa pcre pipewire + cups epoxy mesa pcre pipewire wayland wayland-protocols kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem - kirigami2 kdeclarative plasma-framework + kirigami2 kdeclarative plasma-framework plasma-wayland-protocols ]; } diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix index 6f841958c7959..3c84f5558a110 100644 --- a/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -4,6 +4,7 @@ mkXfceDerivation { category = "apps"; pname = "mousepad"; version = "0.4.2"; + odd-unstable = false; sha256 = "0a35vaq4l0d8vzw7hqpvbgkr3wj1sqr2zvj7bc5z4ikz2cppqj7p"; diff --git a/pkgs/desktops/xfce/applications/orage/default.nix b/pkgs/desktops/xfce/applications/orage/default.nix index 08b78ec400674..3af6c0a6bbabc 100644 --- a/pkgs/desktops/xfce/applications/orage/default.nix +++ b/pkgs/desktops/xfce/applications/orage/default.nix @@ -1,18 +1,23 @@ -{ lib, fetchpatch, mkXfceDerivation, dbus-glib, gtk2, libical, libnotify, tzdata -, popt, libxfce4ui, xfce4-panel, withPanelPlugin ? true }: +{ stdenv, fetchurl, fetchpatch, pkg-config, intltool, dbus-glib, gtk2, libical, libnotify, tzdata +, popt, libxfce4ui, xfce4-panel, withPanelPlugin ? true, wrapGAppsHook, xfce }: assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; let - inherit (lib) optionals; + inherit (stdenv.lib) optionals; in -mkXfceDerivation { - category = "archive"; +stdenv.mkDerivation rec { pname = "orage"; version = "4.12.1"; - sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m"; + src = fetchurl { + url = "https://archive.xfce.org/src/apps/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + sha256 = "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w"; + }; + + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; + buildInputs = [ dbus-glib gtk2 libical libnotify popt ] ++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ]; @@ -28,12 +33,21 @@ mkXfceDerivation { # Fix build with libical 3.0 (fetchpatch { name = "fix-libical3.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libical3.patch?h=packages/orage&id=7b1b06c42dda034d538977b9f3550b28e370057f"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/libical3.patch?h=orage-4.10"; sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf"; }) ]; - meta = { - description = "A simple calendar application with reminders"; + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.archiveLister "apps" pname; + }; + + meta = with stdenv.lib; { + description = "Simple calendar application with reminders"; + homepage = "https://git.xfce.org/archive/orage/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix index 7ab12461046be..df46a80c4b7be 100644 --- a/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfwm4"; - version = "4.14.5"; + version = "4.14.6"; - sha256 = "0xxprhs8g00ysrl25y6z9agih6wb7n29v5f5m2icaz7yjvj1k9iv"; + sha256 = "1ml5b4nn8laqhjihfqqsbjn66525abhin5d32bplh1k9yfxw4xi4"; nativeBuildInputs = [ exo librsvg ]; diff --git a/pkgs/desktops/xfce/mkXfceDerivation.nix b/pkgs/desktops/xfce/mkXfceDerivation.nix index 4c6edf99b611a..8709b84820c40 100644 --- a/pkgs/desktops/xfce/mkXfceDerivation.nix +++ b/pkgs/desktops/xfce/mkXfceDerivation.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }: +{ stdenv, fetchFromGitLab, pkgconfig, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }: { category , pname @@ -23,14 +23,16 @@ let zipAttrsWithNames (filterAttrNames isList (head attrsets)) (_: concatLists) attrsets; template = rec { - name = "${pname}-${version}"; + inherit pname version; nativeBuildInputs = [ pkgconfig xfce4-dev-tools wrapGAppsHook ]; buildInputs = [ hicolor-icon-theme ]; configureFlags = [ "--enable-maintainer-mode" ]; - src = fetchgit { - url = "git://git.xfce.org/${category}/${pname}"; + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = category; + repo = pname; inherit rev sha256; }; @@ -41,11 +43,11 @@ let passthru.updateScript = xfce.updateScript { inherit pname version attrPath rev-prefix odd-unstable patchlevel-unstable; - versionLister = xfce.gitLister src.url; + versionLister = xfce.gitLister src.meta.homepage; }; meta = with stdenv.lib; { - homepage = "https://git.xfce.org/${category}/${pname}/about"; + homepage = "https://gitlab.xfce.org/${category}/${pname}/about"; license = licenses.gpl2; # some libraries are under LGPLv2+ platforms = platforms.linux; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix index affc957c51df9..fcd40462f6d60 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix @@ -1,29 +1,36 @@ -{ stdenv, pkgconfig, fetchFromGitHub, python2, vala_0_40 -, gtk2, libwnck, libxfce4util, xfce4-panel, wafHook }: +{ stdenv, pkgconfig, fetchFromGitHub, python2, vala_0_46 +, gtk3, libwnck3, libxfce4util, xfce4-panel, wafHook, xfce }: stdenv.mkDerivation rec { - ver = "0.3.1"; - rev = "07a23b3"; - name = "xfce4-namebar-plugin-${ver}"; + pname = "xfce4-namebar-plugin"; + version = "1.0.0"; src = fetchFromGitHub { - owner = "TiZ-EX1"; - repo = "xfce4-namebar-plugin"; - rev = rev; - sha256 = "1sl4qmjywfvv53ch7hyfysjfd91zl38y7gdw2y3k69vkzd3h18ad"; + owner = "HugLifeTiZ"; + repo = pname; + rev = "v${version}"; + sha256 = "0l70f6mzkscsj4wr43wp5c0l2qnf85vj24cv02bjrh3bzz6wkak8"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; - buildInputs = [ python2 vala_0_40 gtk2 libwnck libxfce4util xfce4-panel ]; + nativeBuildInputs = [ pkgconfig vala_0_46 wafHook ]; + buildInputs = [ gtk3 libwnck3 libxfce4util xfce4-panel ]; postPatch = '' - substituteInPlace src/preferences.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }" - substituteInPlace src/namebar.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }" + for f in src/preferences.vala src/namebar.vala; do + substituteInPlace $f --replace 'var dirs = Environment.get_system_data_dirs()' "string[] dirs = { \"$out/share\" }" + done ''; + passthru.updateScript = xfce.updateScript { + inherit pname version; + attrPath = "xfce.${pname}"; + versionLister = xfce.gitLister src.meta.homepage; + rev-prefix = "v"; + }; + meta = with stdenv.lib; { - homepage = "https://github.com/TiZ-EX1/xfce4-namebar-plugin"; - description = "A plugins which integrates titlebar and window controls into the xfce4-panel"; + homepage = "https://github.com/HugLifeTiZ/xfce4-namebar-plugin"; + description = "Plugin which integrates titlebar and window controls into the xfce4-panel"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.volth ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index ac9f22a9a0cc3..ef269d64e04c1 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -5,6 +5,7 @@ mkXfceDerivation { pname = "xfce4-whiskermenu-plugin"; version = "2.4.6"; rev-prefix = "v"; + odd-unstable = false; sha256 = "03asfaxqbhawzb3870az7qgid5y7cg3ip8h6r4z8kavcd0b7x4ii"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/arduino/arduino-ci/default.nix b/pkgs/development/arduino/arduino-ci/default.nix index cdc6cb8ccb612..b6b1fc9c89d14 100644 --- a/pkgs/development/arduino/arduino-ci/default.nix +++ b/pkgs/development/arduino/arduino-ci/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchFromGitHub, makeWrapper, arduino-cli, ruby, python3, patchelf }: +{ stdenv, fetchFromGitHub, makeWrapper, arduino-cli, ruby, python3 }: let runtimePath = stdenv.lib.makeBinPath [ arduino-cli - (python3.withPackages (ps: [ ps.pyserial ])) # required by esp32 core - patchelf # required by esp32 core + python3 # required by the esp8266 core ]; in stdenv.mkDerivation rec { pname = "arduino-ci"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "pololu"; repo = "arduino-ci"; rev = "v${version}"; - sha256 = "sha256-uLCLupzJ446WcxXZtzJk1wnae+k1NTSy0cGHLqW7MZU="; + sha256 = "sha256-9RbBxgwsSQ7oGGKr1Vsn9Ug9AsacoRgvQgd9jbRQ034="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 1c537edd0b420..07e9c7bdb0281 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -11,7 +11,8 @@ , ncurses , readline , withGui ? false -, gtk2 ? null +, gtk3 ? null +, wrapGAppsHook , withTeensyduino ? false /* Packages needed for Teensyduino */ , upx @@ -29,7 +30,7 @@ , udev }: -assert withGui -> gtk2 != null; +assert withGui -> gtk3 != null && wrapGAppsHook != null; assert withTeensyduino -> withGui; let externalDownloads = import ./downloads.nix { @@ -55,7 +56,7 @@ let gcc.cc.lib gdk-pixbuf glib - gtk2 + gtk3 libpng12 libusb-compat-0_1 pango @@ -78,39 +79,40 @@ let + stdenv.lib.optionalString (!withGui) "-core"; in stdenv.mkDerivation rec { - version = "1.8.12"; + version = "1.8.13"; name = "${flavor}-${version}"; src = fetchFromGitHub { owner = "arduino"; repo = "Arduino"; rev = version; - sha256 = "0lxkyvsh55biz2q20ba4qabraind5cpxznl41zfq027vl22j6kd2"; + sha256 = "0qg3qyj1b7wbaw2rsfly7nf3115h26nskl4ggrn6plhx272ni84p"; }; - teensyduino_version = "151"; + teensyduino_version = "153"; teensyduino_src = fetchurl { url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}"; sha256 = { - linux64 = "0q8mw9bm2vb5vwa98gwcs6ad164i98hc1qqh2qw029yhwm599pn0"; - linux32 = "1rq6sx0048ab200jy0cz5vznwxi99avidngj42rjnh7kcfas5c4m"; - linuxarm = "19j55bq36040rpdpfxcqimda76rkbx137q15bs8nvxj13wrbl4ip"; - linuxaarch64 = "09k78dycn1vcpcx37c1dak8bgjv8gs34l89n9r9s0c3rqmv3pg4x"; + linux64 = "02qgsj4h4zrjxkcclx7clsqbqd699kg0dq1xxa9hbj3vfnddjv1f"; + linux32 = "14xaff8xj176ih8ifdvxsly5xgjjm82dqbn7lqq81a43i0svjjyn"; + linuxarm = "0xpg9axa6dqyhccm9cpvsv2al7rgwy4gv2l8b2kffvn974dl5759"; + linuxaarch64 = "1lyn4zy4l5mml3c19fw6i2pk1ypnq6mgjmxmzk9d54wpf6n3j5dk"; }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}"); }; # Used because teensyduino requires jars be a specific size arduino_dist_src = fetchurl { - url = "http://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz"; + url = "https://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz"; sha256 = { - linux64 = "128f34kkxz7ab6ir5mqyr8d1mgxig8f9jygwxy44pdnq2rk6gmh9"; - linux32 = "11n85lwsn1w4ysfacyw08v85s3f3zvl8j8ac7rld19yxgjslvisi"; - linuxarm = "1k8yjivaydm6y16mplrjyblgx7l0wjzm3mjxh5saxrjq7drswmxx"; - linuxaarch64 = "04v2nhyjhahml6nmz23bfb63c0an4a7zxgcgxqqq442i8vd304wa"; + linux64 = "1bdlk51dqiyg5pw23hs8rfv8nrjqy0jqfl89h1466ahahpnd080v"; + linux32 = "0mgsw9wpwv1pgs2jslzflh7zf4ggqjgcd55hmdzrj0dvgkyw4cr2"; + linuxarm = "08n4lpak3i7yfyi0085j4nq14gb2n7zx85wl9drp8gaavxnfbp5f"; + linuxaarch64 = "0m4nhykzknm2hdpz1fhr2hbpncry53kvzs9y5lgj7rx3sy6ygbh7"; }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}"); }; + nativeBuildInputs = [ wrapGAppsHook ]; buildInputs = [ jdk ant @@ -149,7 +151,7 @@ stdenv.mkDerivation rec { # This will be patched into `arduino` wrapper script # Java loads gtk dynamically, so we need to provide it using LD_LIBRARY_PATH - dynamicLibraryPath = lib.makeLibraryPath [ gtk2 ]; + dynamicLibraryPath = lib.makeLibraryPath [ gtk3 ]; javaPath = lib.makeBinPath [ jdk ]; # Everything else will be patched into rpath diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/pkgs/development/arduino/arduino-core/downloads.nix index f2edf64ceb6f2..76fa7664f0e09 100644 --- a/pkgs/development/arduino/arduino-core/downloads.nix +++ b/pkgs/development/arduino/arduino-core/downloads.nix @@ -107,20 +107,20 @@ url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.10.10/WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip"; sha256 = "0bs5qdglsfc2q5c48m6wdjpzhz4ya4askh1g8364dp6p7jmg6w0d"; }; - "build/avr-1.8.2.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/cores/avr-1.8.2.tar.bz2"; - sha256 = "06zl8fwphknd0qdx87fcr1003gid1yqsazaj674mm9widqfd84v2"; + "build/avr-1.8.3.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/cores/avr-1.8.3.tar.bz2"; + sha256 = "051wnc0nmsmxvvs4c79zvjag33yx5il2pz2j7qyjsxkp4jc9p2ny"; }; } // optionalAttrs (system == "x86_64-linux") { - "build/arduino-builder-linux64-1.5.2.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.5.2.tar.bz2"; - sha256 = "0wypr9a2cbv9r0ignsr13raw09i3vfc5zvkjxp2xwb7mv35y77z3"; + "build/arduino-builder-linux64-1.5.4.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.5.4.tar.bz2"; + sha256 = "1cgvwlvxzzpjaj4njz1mrsif27l26dwkz9c7gbhdj0lvlk3xsa7s"; }; - "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"; - sha256 = "1yq6a811dabrkcgzfi3jsys41r19qsna46kglkjbcy0rza7yvzry"; + "build/linux/avr-gcc-7.3.0-atmel3.6.1-arduino7-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino7-x86_64-pc-linux-gnu.tar.bz2"; + sha256 = "07nrzv7gsq7bi7ichlw3xsdvgzk0lvv56b73ksn3089ajpv3g35x"; }; "build/linux/avrdude-6.3.0-arduino17-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-x86_64-pc-linux-gnu.tar.bz2"; diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix index 856c6e58bc18e..bcac4eeb9c463 100644 --- a/pkgs/development/compilers/crystal/build-package.nix +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -1,6 +1,7 @@ { stdenv, lib, crystal, shards, git, pkgconfig, which, linkFarm, fetchFromGitHub, installShellFiles }: -{ # Some projects do not include a lock file, so you can pass one +{ + # Some projects do not include a lock file, so you can pass one lockFile ? null # Generate shards.nix with `nix-shell -p crystal2nix --run crystal2nix` in the projects root , shardsFile ? null @@ -10,10 +11,11 @@ , installManPages ? true # Specify binaries to build in the form { foo.src = "src/foo.cr"; } # The default `crystal build` options can be overridden with { foo.options = [ "--no-debug" ]; } -, crystalBinaries ? { }, ... }@args: +, crystalBinaries ? { } +, ... +}@args: assert (builtins.elem format [ "make" "crystal" "shards" ]); - let mkDerivationArgs = builtins.removeAttrs args [ "format" @@ -23,22 +25,34 @@ let "crystalBinaries" ]; - crystalLib = linkFarm "crystal-lib" (lib.mapAttrsToList (name: value: { - inherit name; - path = fetchFromGitHub value; - }) (import shardsFile)); + crystalLib = linkFarm "crystal-lib" (lib.mapAttrsToList + (name: value: { + inherit name; + path = fetchFromGitHub value; + }) + (import shardsFile)); # we previously had --no-debug here but that is not recommended by upstream defaultOptions = [ "--release" "--progress" "--verbose" ]; buildDirectly = shardsFile == null || crystalBinaries != { }; -in stdenv.mkDerivation (mkDerivationArgs // { - configurePhase = args.configurePhase or lib.concatStringsSep "\n" ([ - "runHook preConfigure" - ] ++ lib.optional (lockFile != null) "ln -s ${lockFile} ./shard.lock" - ++ lib.optional (shardsFile != null) "ln -s ${crystalLib} lib" - ++ [ "runHook postConfigure "]); +in +stdenv.mkDerivation (mkDerivationArgs // { + + configurePhase = args.configurePhase or lib.concatStringsSep "\n" + ( + [ + "runHook preConfigure" + ] + ++ lib.optional (lockFile != null) "cp ${lockFile} ./shard.lock" + ++ lib.optionals (shardsFile != null) [ + "test -e lib || mkdir lib" + "for d in ${crystalLib}/*; do ln -s $d lib/; done" + "cp shard.lock lib/.shards.info" + ] + ++ [ "runHook postConfigure" ] + ); CRFLAGS = lib.concatStringsSep " " defaultOptions; @@ -53,24 +67,31 @@ in stdenv.mkDerivation (mkDerivationArgs // { "runHook preBuild" ] ++ lib.optional (format == "make") ''make ''${buildTargets:-build} $makeFlags'' - ++ lib.optionals (format == "crystal") (lib.mapAttrsToList (bin: attrs: '' - crystal ${lib.escapeShellArgs (["build" "-o" bin - (attrs.src or (throw "No source file for crystal binary ${bin} provided")) - ] ++ (attrs.options or defaultOptions))} - '') crystalBinaries) + ++ lib.optionals (format == "crystal") (lib.mapAttrsToList + (bin: attrs: '' + crystal ${lib.escapeShellArgs ([ + "build" + "-o" + bin + (attrs.src or (throw "No source file for crystal binary ${bin} provided")) + ] ++ (attrs.options or defaultOptions))} + '') + crystalBinaries) ++ lib.optional (format == "shards") - "shards build --local --production ${lib.concatStringsSep " " defaultOptions}" + "shards build --local --production ${lib.concatStringsSep " " defaultOptions}" ++ [ "runHook postBuild" ])); installPhase = args.installPhase or (lib.concatStringsSep "\n" ([ "runHook preInstall" ] ++ lib.optional (format == "make") ''make ''${installTargets:-install} $installFlags'' - ++ lib.optionals (format == "crystal") (map (bin: '' + ++ lib.optionals (format == "crystal") (map + (bin: '' install -Dm555 ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]} - '') (lib.attrNames crystalBinaries)) + '') + (lib.attrNames crystalBinaries)) ++ lib.optional (format == "shards") - ''install -Dm555 bin/* -t $out/bin'' + ''install -Dm555 bin/* -t $out/bin'' ++ [ '' for f in README* *.md LICENSE; do @@ -78,9 +99,9 @@ in stdenv.mkDerivation (mkDerivationArgs // { done '' ] ++ (lib.optional installManPages '' - if [ -d man ]; then - installManPage man/*.? - fi + if [ -d man ]; then + installManPage man/*.? + fi '') ++ [ "runHook postInstall" ])); diff --git a/pkgs/development/compilers/crystal/crystal2nix.cr b/pkgs/development/compilers/crystal/crystal2nix.cr deleted file mode 100644 index 0610de5cfa4d7..0000000000000 --- a/pkgs/development/compilers/crystal/crystal2nix.cr +++ /dev/null @@ -1,42 +0,0 @@ -require "yaml" -require "json" - -class PrefetchJSON - JSON.mapping(sha256: String) -end - -class ShardLock - YAML.mapping( - version: Float32, - shards: Hash(String, Hash(String, String)) - ) -end - -File.open "shards.nix", "w+" do |file| - file.puts %({) - yaml = ShardLock.from_yaml(File.read("shard.lock")) - yaml.shards.each do |key, value| - owner, repo = value["github"].split("/") - url = "https://github.com/#{value["github"]}" - rev = if value["version"]? - "v#{value["version"]}" - else - value["commit"] - end - - sha256 = "" - args = ["--url", url, "--rev", rev] - Process.run("@nixPrefetchGit@", args: args) do |x| - x.error.each_line { |e| puts e } - sha256 = PrefetchJSON.from_json(x.output).sha256 - end - - file.puts %( #{key} = {) - file.puts %( owner = "#{owner}";) - file.puts %( repo = "#{repo}";) - file.puts %( rev = "#{rev}";) - file.puts %( sha256 = "#{sha256}";) - file.puts %( };) - end - file.puts %(}) -end diff --git a/pkgs/development/compilers/crystal/crystal2nix.nix b/pkgs/development/compilers/crystal/crystal2nix.nix deleted file mode 100644 index 5fc40cd23741d..0000000000000 --- a/pkgs/development/compilers/crystal/crystal2nix.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, crystal, nix-prefetch-git }: - -crystal.buildCrystalPackage { - pname = "crystal2nix"; - version = "unstable-2018-07-31"; - - nixPrefetchGit = "${lib.getBin nix-prefetch-git}/bin/nix-prefetch-git"; - unpackPhase = "substituteAll ${./crystal2nix.cr} crystal2nix.cr"; - - format = "crystal"; - - crystalBinaries.crystal2nix.src = "crystal2nix.cr"; - - # it will blow up without a shard.yml file - doInstallCheck = false; - - meta = with lib; { - description = "Utility to convert Crystal's shard.lock files to a Nix file"; - license = licenses.mit; - maintainers = with maintainers; [ manveru ]; - }; -} diff --git a/pkgs/development/compilers/crystal2nix/default.nix b/pkgs/development/compilers/crystal2nix/default.nix new file mode 100644 index 0000000000000..25cbbd4d01aab --- /dev/null +++ b/pkgs/development/compilers/crystal2nix/default.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub, fetchgit, crystal, makeWrapper, nix-prefetch-git }: + +crystal.buildCrystalPackage rec { + pname = "crystal2nix"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "peterhoeg"; + repo = "crystal2nix"; + rev = "v${version}"; + sha256 = "sha256-K1ElG8VC/D0axmSRaufH3cE50xNQisAmFucDkV+5O0s="; + }; + + format = "shards"; + + shardsFile = ./shards.nix; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/crystal2nix \ + --prefix PATH : ${lib.makeBinPath [ nix-prefetch-git ]} + ''; + + # temporarily off. We need the checks to execute the wrapped binary + doCheck = false; + + # it requires an internet connection when run + doInstallCheck = false; + + meta = with lib; { + description = "Utility to convert Crystal's shard.lock files to a Nix file"; + license = licenses.mit; + maintainers = with maintainers; [ manveru peterhoeg ]; + }; +} diff --git a/pkgs/development/compilers/crystal2nix/shards.nix b/pkgs/development/compilers/crystal2nix/shards.nix new file mode 100644 index 0000000000000..abfc0f93072d7 --- /dev/null +++ b/pkgs/development/compilers/crystal2nix/shards.nix @@ -0,0 +1,14 @@ +{ + json_mapping = { + owner = "crystal-lang"; + repo = "json_mapping.cr"; + rev = "v0.1.0"; + sha256 = "1qq5vs2085x7cwmp96rrjns0yz9kiz1lycxynfbz5psxll6b8p55"; + }; + yaml_mapping = { + owner = "crystal-lang"; + repo = "yaml_mapping.cr"; + rev = "v0.1.0"; + sha256 = "02spz1521g59ar6rp0znnr01di766kknbjxjnygs39yn0cmpzqc1"; + }; +} diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index 0b37dcf64fcbd..40f3e38e506c5 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -36,6 +36,38 @@ stdenv.mkDerivation { }; patches = [ + # https://trac.sagemath.org/ticket/22191#comment:237 + (fetchurl { + name = "ECL_WITH_LISP_FPE.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/ECL_WITH_LISP_FPE.patch?h=9.2"; + sha256 = "0b194613avcmzr1k9gq725z41wdkg5rsa0q21kdw050iqpprcj1c"; + }) + + # https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/1 + (fetchurl { + name = "write_error.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/write_error.patch?h=9.2"; + sha256 = "1lvdvh77blnxp0zbd27dsbq1ljkb5qblabf1illszn4j7qgq88fh"; + }) + + # Three patches to fix ecl's unicode handling (https://trac.sagemath.org/ticket/30122) + (fetchurl { + name = "0001-unicode-fix-ecl_string_case-for-non-ascii-characters.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/0001-unicode-fix-ecl_string_case-for-non-ascii-characters.patch?h=9.2"; + sha256 = "0z8pnhawivrrbg4vz144nr2sz64jxp7764hn6df13bgkz84iqbmk"; + }) + + (fetchurl { + name = "0002-cosmetic-fix-some-compiler-warnings.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/0002-cosmetic-fix-some-compiler-warnings.patch?h=9.2"; + sha256 = "0msx3say9igwr9z5ywnr3gs6vsndnzlx47fmzwzh4l0m274cnia8"; + }) + + (fetchurl { + name = "0003-printer-fix-printing-of-symbols-with-non-ascii-names.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/0003-printer-fix-printing-of-symbols-with-non-ascii-names.patch?h=9.2"; + sha256 = "0ln5dsx6p265fkph3bl5wblgfi3f7frb4jl6v473wz3ibvcx1x9a"; + }) ]; configureFlags = [ diff --git a/pkgs/development/compilers/flasm/default.nix b/pkgs/development/compilers/flasm/default.nix new file mode 100644 index 0000000000000..9393d4fc59f4a --- /dev/null +++ b/pkgs/development/compilers/flasm/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchzip, unzip, bison, flex, gperf, zlib }: + +stdenv.mkDerivation rec { + pname = "flasm"; + version = "1.64"; + + src = fetchzip { + url = "https://www.nowrap.de/download/flasm16src.zip"; + sha256 = "03hvxm66rb6rjwbr07hc3k7ia5rim2xlhxbd9qmcai9xwmyiqafg"; + stripRoot = false; + }; + + makeFlags = [ "CC=cc" ]; + + nativeBuildInputs = [ unzip bison flex gperf ]; + + buildInputs = [ zlib ]; + + installPhase = '' + install -Dm755 flasm -t $out/bin + ''; + + meta = with stdenv.lib; { + description = "Assembler and disassembler for Flash (SWF) bytecode"; + homepage = "http://flasm.sourceforge.net/"; + license = licenses.bsd2; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/compilers/ghc/8.10.3.nix b/pkgs/development/compilers/ghc/8.10.3.nix new file mode 100644 index 0000000000000..c24b72fb43bd4 --- /dev/null +++ b/pkgs/development/compilers/ghc/8.10.3.nix @@ -0,0 +1,256 @@ +{ stdenv, pkgsBuildTarget, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx +, bash + +, libiconv ? null, ncurses + +, # GHC can be built with system libffi or a bundled one. + libffi ? null + +, useLLVM ? !stdenv.targetPlatform.isx86 +, # LLVM is conceptually a run-time-only depedendency, but for + # non-x86, we need LLVM to bootstrap later stages, so it becomes a + # build-time dependency too. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. + enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + + # aarch64 outputs otherwise exceed 2GB limit +, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt + +, # Whether to build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + (if useLLVM then "perf-cross" else "perf-cross-ncg") + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 +}: + +assert !enableIntegerSimple -> gmp != null; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString (!enableProfiledLibs) '' + GhcLibWays = "v dyn" + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses + ++ [libffi] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + + # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; + +in +stdenv.mkDerivation (rec { + version = "8.10.3"; + name = "${targetPrefix}ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "0cdrdvs5qnqr93cr9zvrlfjv2xr671kjjghnsw4afa4hahcq7p6c"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + patches = stdenv.lib.optionals stdenv.isDarwin [ + # Make Block.h compile with c++ compilers. Remove with the next release + (fetchpatch { + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; + sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5"; + }) + ]; + + postPatch = "patchShebangs ."; + + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + stdenv.lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ stdenv.lib.optionals useLdGold [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatibility. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 sphinx + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; + inherit (ghc.meta) license platforms; + }; + +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index c67b011721a07..36b42cef39269 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, callPackage, wrapCCWith }: let - version = "3.10.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - hash = "sha256-Lnma831RXJMnn3N8im3QLy6dYfXAvtbeFX/0CKvpkgY="; + hash = "sha256-nIvqEk18NLtY8Hec2Iq6ufWMblzYJ8SOIXgqomtqa0s="; }; in rec { clang = wrapCCWith rec { diff --git a/pkgs/development/compilers/ocaml/4.12.nix b/pkgs/development/compilers/ocaml/4.12.nix index 444d332817b63..16649f09869fd 100644 --- a/pkgs/development/compilers/ocaml/4.12.nix +++ b/pkgs/development/compilers/ocaml/4.12.nix @@ -1,9 +1,9 @@ import ./generic.nix { major_version = "4"; minor_version = "12"; - patch_version = "0-alpha2"; + patch_version = "0-alpha3"; src = fetchTarball { - url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha2.tar.xz"; - sha256 = "148vgjcfajjvrvh0q9kb2y7fszqd02cikb5wyznz7kjxka6xxyn9"; + url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha3.tar.xz"; + sha256 = "1hqlf9fi5gmvb6r13z5819rg6k813bw9ihgbbji67hhh4q361wlw"; }; } diff --git a/pkgs/development/compilers/rust/1_45.nix b/pkgs/development/compilers/rust/1_45.nix index 2b3de4dd38c61..b4d887f2e9644 100644 --- a/pkgs/development/compilers/rust/1_45.nix +++ b/pkgs/development/compilers/rust/1_45.nix @@ -11,15 +11,24 @@ , buildPackages , newScope, callPackage , CoreFoundation, Security -, llvmPackages -, pkgsBuildTarget, pkgsBuildBuild +, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost , makeRustPlatform +, llvmPackages_5, llvm_10 } @ args: import ./default.nix { rustcVersion = "1.45.2"; rustcSha256 = "0273a1g3f59plyi1n0azf21qjzwml1yqdnj5z472crz37qggr8xp"; + llvmSharedForBuild = pkgsBuildBuild.llvm_10.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvm_10.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvm_10.override { enableSharedLibraries = true; }; + + llvmBootstrapForDarwin = llvmPackages_5; + + # For use at runtime + llvmShared = llvm_10.override { enableSharedLibraries = true; }; + # Note: the version MUST be one version prior to the version we're # building bootstrapVersion = "1.44.1"; @@ -41,4 +50,4 @@ import ./default.nix { ]; } -(builtins.removeAttrs args [ "fetchpatch" ]) +(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_5" "llvm_10" ]) diff --git a/pkgs/development/compilers/rust/1_48.nix b/pkgs/development/compilers/rust/1_48.nix index b3a512e58bdcd..6b4b10f12d3e3 100644 --- a/pkgs/development/compilers/rust/1_48.nix +++ b/pkgs/development/compilers/rust/1_48.nix @@ -13,15 +13,24 @@ , buildPackages , newScope, callPackage , CoreFoundation, Security -, llvmPackages -, pkgsBuildTarget, pkgsBuildBuild +, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost , makeRustPlatform +, llvmPackages_5, llvm_11 } @ args: import ./default.nix { rustcVersion = "1.48.0"; rustcSha256 = "0fz4gbb5hp5qalrl9lcl8yw4kk7ai7wx511jb28nypbxninkwxhf"; + llvmSharedForBuild = pkgsBuildBuild.llvm_11.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvm_11.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvm_11.override { enableSharedLibraries = true; }; + + llvmBootstrapForDarwin = llvmPackages_5; + + # For use at runtime + llvmShared = llvm_11.override { enableSharedLibraries = true; }; + # Note: the version MUST be one version prior to the version we're # building bootstrapVersion = "1.47.0"; @@ -43,4 +52,4 @@ import ./default.nix { ]; } -(builtins.removeAttrs args [ "fetchpatch" ]) +(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_5" "llvm_11"]) diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 25876cc638033..6203eaf47baf2 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -5,12 +5,16 @@ , bootstrapHashes , selectRustPackage , rustcPatches ? [] +, llvmBootstrapForDarwin +, llvmShared +, llvmSharedForBuild +, llvmSharedForHost +, llvmSharedForTarget }: { stdenv, lib , buildPackages , newScope, callPackage , CoreFoundation, Security -, llvmPackages , pkgsBuildTarget, pkgsBuildBuild , makeRustPlatform }: rec { @@ -76,16 +80,17 @@ version = rustcVersion; sha256 = rustcSha256; inherit enableRustcDev; + inherit llvmShared llvmSharedForBuild llvmSharedForHost llvmSharedForTarget; patches = rustcPatches; # Use boot package set to break cycle rustPlatform = bootRustPlatform; } // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) { - stdenv = llvmPackages.stdenv; - pkgsBuildBuild = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages.stdenv; }; - pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages.stdenv; }; - pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmPackages.stdenv; }; + stdenv = llvmBootstrapForDarwin.stdenv; + pkgsBuildBuild = pkgsBuildBuild // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; }; + pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; }; + pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmBootstrapForDarwin.stdenv; }; }); rustfmt = self.callPackage ./rustfmt.nix { inherit Security; }; cargo = self.callPackage ./cargo.nix { diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index a290eb11755f1..570cd8b796fdc 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,6 +1,7 @@ { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget +, llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget , fetchurl, file, python3 -, llvm_10, darwin, cmake, rust, rustPlatform +, darwin, cmake, rust, rustPlatform , pkgconfig, openssl , which, libffi , withBundledLLVM ? false @@ -13,13 +14,6 @@ let inherit (stdenv.lib) optionals optional optionalString concatStringsSep; inherit (darwin.apple_sdk.frameworks) Security; - - llvmSharedForBuild = pkgsBuildBuild.llvm_10.override { enableSharedLibraries = true; }; - llvmSharedForHost = pkgsBuildHost.llvm_10.override { enableSharedLibraries = true; }; - llvmSharedForTarget = pkgsBuildTarget.llvm_10.override { enableSharedLibraries = true; }; - - # For use at runtime - llvmShared = llvm_10.override { enableSharedLibraries = true; }; in stdenv.mkDerivation rec { pname = "rustc"; inherit version; @@ -154,6 +148,11 @@ in stdenv.mkDerivation rec { python x.py dist rustc-dev tar xf build/dist/rustc-dev*tar.gz cp -r rustc-dev*/rustc-dev*/lib/* $out/lib/ + rm $out/lib/rustlib/install.log + for m in $out/lib/rustlib/manifest-rust* + do + sort --output=$m < $m + done '' + '' # remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index aaed6d8892ff9..1a5cba37d4779 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }: llvmPackages.stdenv.mkDerivation rec { - version = "0.6.0"; + version = "0.7.1"; pname = "zig"; src = fetchFromGitHub { owner = "ziglang"; repo = pname; rev = version; - sha256 = "13dwm2zpscn4n0p5x8ggs9n7mwmq9cgip383i3qqphg7m3pkls8z"; + sha256 = "1z6c4ym9jmga46cw2arn7zv2drcpmrf3vw139gscxp27n7q2z5md"; }; nativeBuildInputs = [ cmake ]; @@ -26,7 +26,7 @@ llvmPackages.stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - ./zig test $src/test/stage1/behavior.zig + ./zig test --cache-dir "$TMPDIR" -I $src/test $src/test/stage1/behavior.zig runHook postCheck ''; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 3714a1f6f0fbf..130387a97b0e9 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -36,6 +36,9 @@ , meta ? {} +# Not needed with buildGoModule +, goPackagePath ? null + , ... }@args': with builtins; @@ -43,7 +46,7 @@ with builtins; let args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "disabled" ]; - go-modules = if vendorSha256 != null then go.stdenv.mkDerivation (let modArgs = { + go-modules = if vendorSha256 != null then stdenv.mkDerivation (let modArgs = { name = "${name}-go-modules"; @@ -116,7 +119,7 @@ let } ) // overrideModAttrs modArgs) else ""; - package = go.stdenv.mkDerivation (args // { + package = stdenv.mkDerivation (args // { nativeBuildInputs = [ go ] ++ nativeBuildInputs; inherit (go) GOOS GOARCH; @@ -242,5 +245,7 @@ let }); in if disabled then throw "${package.name} not supported for go ${go.meta.branch}" +else if (goPackagePath != null) then + throw "`goPackagePath` not needed with `buildGoModule`" else package diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index aa8212f167b17..aa3a7386fc9b8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -176,9 +176,6 @@ self: super: { # https://github.com/jputcu/serialport/issues/25 serialport = dontCheck super.serialport; - # Test suite build depends on ancient tasty 0.11.x. - cryptohash-sha512 = dontCheck super.cryptohash-sha512; - # Test suite depends on source code being available simple-affine-space = dontCheck super.simple-affine-space; @@ -815,6 +812,12 @@ self: super: { # Needs QuickCheck <2.10, HUnit <1.6 and base <4.10 pointfree = doJailbreak super.pointfree; + # Depends on base <4.12 + # See https://github.com/haskell-hvr/cryptohash-sha512/pull/3 + # , https://github.com/haskell-hvr/cryptohash-sha512/issues/4 + # and https://github.com/haskell-hvr/cryptohash-sha512/pull/5 + cryptohash-sha512 = doJailbreak super.cryptohash-sha512; + # Depends on tasty < 1.x, which we don't have. cryptohash-sha256 = doJailbreak super.cryptohash-sha256; @@ -859,6 +862,10 @@ self: super: { snap-templates = doJailbreak super.snap-templates; # https://github.com/snapframework/snap-templates/issues/22 swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2; + # hledger-lib requires the latest version of pretty-simple + hledger-lib = super.hledger-lib.override { pretty-simple = self.pretty-simple_4_0_0_0; }; + pretty-simple_4_0_0_0 = super.pretty-simple_4_0_0_0.overrideScope (self: super: { prettyprinter = self.prettyprinter_1_7_0; }); + # Copy hledger man pages from data directory into the proper place. This code # should be moved into the cabal2nix generator. hledger = overrideCabal super.hledger (drv: { @@ -889,6 +896,7 @@ self: super: { ''; }); hledger-web = overrideCabal super.hledger-web (drv: { + preCheck = "export HOME=$TMPDIR"; postInstall = '' for i in $(seq 1 9); do for j in *.$i; do @@ -948,6 +956,8 @@ self: super: { # Generate shell completion. cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; + niv = generateOptparseApplicativeCompletion "niv" super.niv; + ormolu = generateOptparseApplicativeCompletion "ormolu" super.ormolu; stack = generateOptparseApplicativeCompletion "stack" super.stack; # musl fixes @@ -1154,8 +1164,10 @@ self: super: { # $HOME, which we don't have in our build sandbox. cabal-install-parsers = dontCheck super.cabal-install-parsers; - # gitit is unbroken in the latest release - gitit = markUnbroken super.gitit; + # version constraints break the build, so we jailbreak + # can be removed at a new release which also fixes + # https://github.com/jgm/gitit/issues/665 + gitit = doJailbreak super.gitit; # Test suite requires database persistent-mysql = dontCheck super.persistent-mysql; @@ -1397,24 +1409,17 @@ self: super: { # https://github.com/haskell/haskell-language-server/issues/611 haskell-language-server = dontCheck (super.haskell-language-server.override { lsp-test = dontCheck self.lsp-test_0_11_0_7; + fourmolu = self.fourmolu_0_3_0_0; }); fourmolu = dontCheck super.fourmolu; - ghcide = dontCheck (appendPatch super.ghcide (pkgs.fetchpatch { - # 2020-11-13: Bumping bounds via an already upstream merged change - # https://github.com/haskell/ghcide/pull/905 - url = https://github.com/haskell/ghcide/commit/9b8aaf9b06846571cc0b5d46680e686e4f9153a3.patch; - sha256 = "0j8980dmvwjcs72ahq2zc14hwkyd5ybgzyy1az3zq5flp383fai6"; - includes = [ "ghcide.cabal" ]; - })); + # 1. test requires internet + # 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute + ghcide = doDistribute (unmarkBroken (dontCheck + (super.ghcide.override { lsp-test = dontCheck self.lsp-test_0_11_0_7; }) + )); refinery = doDistribute super.refinery_0_3_0_0; data-tree-print = doJailbreak super.data-tree-print; - # the hls brittany is objectively better, because there hasn‘t been a - # brittany release in a while and this version works with 8.10. - # And we need to build it anyways. - # 2020-11-15: jailbreaking because we have strict 0.4 which is to new - brittany = self.hls-brittany; - hls-brittany = dontCheck (doJailbreak super.hls-brittany); # 2020-11-15: aeson 1.5.4.1 needs to new quickcheck-instances for testing aeson = dontCheck super.aeson; @@ -1495,13 +1500,13 @@ self: super: { extraPrefix = ""; includes = [ "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" ]; }); - cachix = appendPatch super.cachix (pkgs.fetchpatch { + cachix = generateOptparseApplicativeCompletion "cachix" (appendPatch super.cachix (pkgs.fetchpatch { url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch; sha256 = "06jmpz8l5vh9cch5aqdbrln7bm3fghxsicwy1m93avli320kp8pp"; stripLen = 2; extraPrefix = ""; excludes = [ "stack.yaml" "sources.json" "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" "cachix-api.cabal" "workflows/test.yml" ]; - }); + })); # 2020-11-23: Jailbreaking until: https://github.com/michaelt/text-pipes/pull/29 pipes-text = doJailbreak super.pipes-text; @@ -1512,7 +1517,6 @@ self: super: { # 2020-11-23: https://github.com/cdornan/fmt/issues/30 fmt = dontCheck super.fmt; - # 2020-11-27: Tests broken # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129 servant-swagger = dontCheck super.servant-swagger; @@ -1520,4 +1524,28 @@ self: super: { # 2020-11-27: cxx-options is broken in Cabal 3.2.0.0 hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0; + # 2020-12-05: http-client is fixed on too old version + essence-of-live-coding-warp = super.essence-of-live-coding-warp.override { + http-client = self.http-client_0_7_3; + }; + + # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) + pandoc-include-code = doJailbreak super.pandoc-include-code; + + # https://github.com/jgm/pandoc/issues/6961 + pandoc = dontCheck super.pandoc; + + # Update pandoc dependencies to fix the build. + doctemplates = self.doctemplates_0_9; + skylighting = self.skylighting_0_10_2; + skylighting-core = self.skylighting-core_0_10_2; + + # https://github.com/yesodweb/yesod/issues/1714 + yesod-core = dontCheck super.yesod-core; + + # Add ApplicationServices on darwin + # use 0.4.5 instead of 0.4.4 to fix build with glibc >= 2.32 + apecs-physics = addPkgconfigDepends super.apecs-physics_0_4_5 + (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.ApplicationServices); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 60d3f42324647..8e53303e9feb6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -83,6 +83,12 @@ self: super: { sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; }); + # Version 4.7.2 is broken by the bytestring library shipped by ghc-8.10.3. + ListLike = appendPatch super.ListLike (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/ListLike-4.7.2.patch"; + sha256 = "1v392a74w0sxyn6x0bqixpmjbgla0i2b5hxzkcn1vaa3gaya7ag4"; + }); + # hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now. hnix = generateOptparseApplicativeCompletion "hnix" (overrideCabal super.hnix (drv: { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 64855e270991e..95dce67b4beb3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,29 +1,29 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.10.2 +compiler: ghc-8.10.3 core-packages: - array-0.5.4.0 - base-4.14.1.0 - binary-0.8.8.0 - - bytestring-0.10.10.0 - - Cabal-3.2.0.0 + - bytestring-0.10.12.0 + - Cabal-3.2.1.0 - containers-0.6.2.1 - deepseq-1.4.4.0 - directory-1.3.6.0 - exceptions-0.10.4 - filepath-1.4.2.1 - - ghc-8.10.2 - - ghc-boot-8.10.2 - - ghc-boot-th-8.10.2 + - ghc-8.10.3 + - ghc-boot-8.10.3 + - ghc-boot-th-8.10.3 - ghc-compact-0.1.0.0 - - ghc-heap-8.10.2 + - ghc-heap-8.10.3 - ghc-prim-0.6.1 - - ghci-8.10.2 + - ghci-8.10.3 - haskeline-0.8.0.1 - hpc-0.6.1.0 - integer-gmp-1.0.3.0 - - libiserv-8.10.2 + - libiserv-8.10.3 - mtl-2.2.2 - parsec-3.1.14.0 - pretty-1.1.3.6 @@ -32,7 +32,7 @@ core-packages: - stm-2.5.0.0 - template-haskell-2.16.0.0 - terminfo-0.4.1.4 - - text-1.2.3.2 + - text-1.2.4.1 - time-1.9.3 - transformers-0.5.6.2 - unix-2.7.2.2 @@ -76,7 +76,7 @@ default-package-overrides: # haskell-language-server 0.5.0.0 doesn't accept newer versions - fourmolu ==0.2.* - refinery ==0.2.* - # Stackage Nightly 2020-12-04 + # Stackage Nightly 2020-12-14 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -292,7 +292,7 @@ default-package-overrides: - base-compat ==0.11.2 - base-compat-batteries ==0.11.2 - basement ==0.0.11 - - base-orphans ==0.8.3 + - base-orphans ==0.8.4 - base-prelude ==1.4 - base-unicode-symbols ==0.2.4.2 - basic-prelude ==0.7.0 @@ -332,6 +332,7 @@ default-package-overrides: - bitset-word8 ==0.1.1.2 - bits-extra ==0.0.2.0 - bitvec ==1.0.3.0 + - bitwise-enum ==1.0.0.2 - blake2 ==0.3.0 - blanks ==0.5.0 - blas-carray ==0.1.0.1 @@ -367,6 +368,7 @@ default-package-overrides: - btrfs ==0.2.0.0 - buffer-builder ==0.2.4.7 - buffer-pipe ==0.0 + - bugsnag-haskell ==0.0.4.1 - bugsnag-hs ==0.2.0.3 - bugzilla-redhat ==0.3.0 - burrito ==1.2.0.0 @@ -391,7 +393,7 @@ default-package-overrides: - bzlib ==0.5.1.0 - bzlib-conduit ==0.3.0.2 - c14n ==0.1.0.1 - - c2hs ==0.28.6 + - c2hs ==0.28.7 - cabal-debian ==5.1 - cabal-doctest ==1.0.8 - cabal-file ==0.1.1 @@ -440,7 +442,7 @@ default-package-overrides: - checkers ==0.5.6 - checksum ==0.0 - chimera ==0.3.1.0 - - chiphunk ==0.1.2.1 + - chiphunk ==0.1.4.0 - choice ==0.2.2 - chronologique ==0.3.1.3 - chronos ==1.1.1 @@ -462,6 +464,7 @@ default-package-overrides: - Clipboard ==2.3.2.0 - clock ==0.8 - clock-extras ==0.1.0.2 + - closed ==0.2.0.1 - clumpiness ==0.17.0.2 - ClustalParser ==1.3.0 - cmark ==0.6 @@ -649,11 +652,11 @@ default-package-overrides: - deriving-aeson ==0.2.6 - deriving-compat ==0.5.10 - derulo ==1.0.9 - - dhall ==1.36.0 - - dhall-bash ==1.0.34 - - dhall-json ==1.7.3 - - dhall-lsp-server ==1.0.11 - - dhall-yaml ==1.2.3 + - dhall ==1.37.0 + - dhall-bash ==1.0.35 + - dhall-json ==1.7.4 + - dhall-lsp-server ==1.0.12 + - dhall-yaml ==1.2.4 - diagrams-solve ==0.1.2 - dialogflow-fulfillment ==0.1.1.3 - di-core ==1.0.4 @@ -743,6 +746,7 @@ default-package-overrides: - enumset ==0.0.5 - enum-subset-generate ==0.1.0.0 - envelope ==0.2.2.0 + - envparse ==0.4.1 - envy ==2.1.0.0 - epub-metadata ==4.5 - eq ==4.2.1 @@ -750,6 +754,8 @@ default-package-overrides: - equational-reasoning ==0.6.0.3 - equivalence ==0.3.5 - erf ==2.0.0.0 + - error-or ==0.1.1.0 + - error-or-utils ==0.1.1 - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.8 @@ -835,7 +841,7 @@ default-package-overrides: - fmlist ==0.9.4 - fmt ==0.6.1.2 - fn ==0.3.0.2 - - focus ==1.0.1.4 + - focus ==1.0.2 - focuslist ==0.1.0.2 - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.9 @@ -990,7 +996,7 @@ default-package-overrides: - gravatar ==0.8.0 - groom ==0.1.2.1 - group-by-date ==0.1.0.3 - - groups ==0.5 + - groups ==0.5.2 - gtk-sni-tray ==0.1.6.0 - gtk-strut ==0.1.3.0 - guarded-allocation ==0.0.1 @@ -1098,7 +1104,7 @@ default-package-overrides: - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.9 - - hpack ==0.34.2 + - hpack ==0.34.3 - hpack-dhall ==0.5.2 - hpc-codecov ==0.2.0.0 - hpc-lcov ==1.0.1 @@ -1166,7 +1172,7 @@ default-package-overrides: - http-client-overrides ==0.1.1.0 - http-client-tls ==0.3.5.3 - http-common ==0.8.2.1 - - http-conduit ==2.3.7.3 + - http-conduit ==2.3.7.4 - http-date ==0.0.10 - http-directory ==0.1.8 - http-download ==0.2.0.0 @@ -1239,6 +1245,7 @@ default-package-overrides: - Imlib ==0.1.2 - immortal ==0.3 - immortal-queue ==0.1.0.1 + - inbox ==0.1.0 - include-file ==0.1.0.4 - incremental-parser ==0.5 - indents ==0.5.0.1 @@ -1444,7 +1451,7 @@ default-package-overrides: - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - massiv ==0.5.7.0 + - massiv ==0.5.8.0 - massiv-io ==0.4.0.0 - massiv-test ==0.1.5 - mathexpr ==0.3.0.0 @@ -1510,6 +1517,7 @@ default-package-overrides: - mmorph ==1.1.3 - mnist-idx ==0.1.2.8 - mockery ==0.3.5 + - mock-time ==0.1.0 - mod ==0.1.2.0 - model ==0.5 - modern-uri ==0.3.3.0 @@ -1524,10 +1532,10 @@ default-package-overrides: - monadlist ==0.0.2 - monad-logger ==0.3.36 - monad-logger-json ==0.1.0.0 - - monad-logger-prefix ==0.1.11 + - monad-logger-prefix ==0.1.12 - monad-loops ==0.4.3 - monad-memo ==0.5.3 - - monad-metrics ==0.2.1.4 + - monad-metrics ==0.2.2.0 - monad-par ==0.3.5 - monad-parallel ==0.7.2.3 - monad-par-extras ==0.3.3 @@ -1657,7 +1665,7 @@ default-package-overrides: - oo-prototypes ==0.1.0.0 - opaleye ==0.7.1.0 - OpenAL ==1.7.0.5 - - openapi3 ==3.0.0.1 + - openapi3 ==3.0.1.0 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - OpenGL ==3.0.3.0 @@ -1707,7 +1715,7 @@ default-package-overrides: - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - partial-semigroup ==0.5.1.8 - - password ==2.0.1.1 + - password ==2.1.0.0 - password-instances ==2.0.0.1 - path ==0.7.0 - path-binary-instance ==0.1.0.1 @@ -1736,6 +1744,7 @@ default-package-overrides: - persistable-types-HDBC-pg ==0.0.3.5 - persistent ==2.10.5.3 - persistent-documentation ==0.1.0.2 + - persistent-mtl ==0.2.0.0 - persistent-mysql ==2.10.2.3 - persistent-pagination ==0.1.1.2 - persistent-postgresql ==2.10.1.2 @@ -1748,6 +1757,7 @@ default-package-overrides: - pg-transact ==0.3.1.1 - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 + - pinboard ==0.10.2.0 - pipes ==4.3.14 - pipes-aeson ==0.4.1.8 - pipes-attoparsec ==0.5.1.5 @@ -1954,7 +1964,7 @@ default-package-overrides: - relude ==0.7.0.0 - renderable ==0.2.0.1 - replace-attoparsec ==1.4.2.0 - - replace-megaparsec ==1.4.3.0 + - replace-megaparsec ==1.4.4.0 - repline ==0.4.0.0 - req ==3.8.0 - req-conduit ==1.0.0 @@ -2067,7 +2077,7 @@ default-package-overrides: - servant-swagger ==1.1.10 - servant-swagger-ui ==0.3.4.3.37.2 - servant-swagger-ui-core ==0.3.4 - - serverless-haskell ==0.12.4 + - serverless-haskell ==0.12.5 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - ses-html ==0.4.0.0 @@ -2195,7 +2205,7 @@ default-package-overrides: - streaming-bytestring ==0.2.0 - streaming-commons ==0.2.2.1 - streams ==3.3 - - strict ==0.4 + - strict ==0.4.0.1 - strict-concurrency ==0.2.4.3 - strict-list ==0.1.5 - strict-tuple ==0.1.4 @@ -2239,6 +2249,7 @@ default-package-overrides: - system-filepath ==0.4.14 - system-info ==0.5.1 - tabular ==0.2.2.8 + - taffybar ==3.2.3 - tagchup ==0.4.1.1 - tagged ==0.8.6 - tagged-binary ==0.2.0.1 @@ -2314,7 +2325,7 @@ default-package-overrides: - text-zipper ==0.10.1 - tfp ==1.0.1.1 - tf-random ==0.5 - - th-abstraction ==0.4.0.0 + - th-abstraction ==0.4.1.0 - th-bang-compat ==0.0.1.0 - th-compat ==0.1 - th-constraint-compat ==0.0.1.0 @@ -2348,7 +2359,7 @@ default-package-overrides: - thyme ==0.3.5.5 - tidal ==1.6.1 - tile ==0.3.0.0 - - time-compat ==1.9.4 + - time-compat ==1.9.5 - timeit ==2.0 - timelens ==0.2.0.2 - time-lens ==0.4.0.2 @@ -2459,7 +2470,7 @@ default-package-overrides: - unordered-containers ==0.2.13.0 - unsafe ==0.0 - urbit-hob ==0.3.3 - - uri-bytestring ==0.3.2.2 + - uri-bytestring ==0.3.3.0 - uri-bytestring-aeson ==0.1.0.8 - uri-encode ==1.5.0.7 - url ==2.1.3 @@ -2489,7 +2500,7 @@ default-package-overrides: - vault ==0.3.1.4 - vec ==0.3 - vector ==0.12.1.2 - - vector-algorithms ==0.8.0.3 + - vector-algorithms ==0.8.0.4 - vector-binary-instances ==0.2.5.1 - vector-buffer ==0.4.1 - vector-builder ==0.3.8 @@ -2497,7 +2508,7 @@ default-package-overrides: - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.0 - - vector-sized ==1.4.2 + - vector-sized ==1.4.3 - vector-space ==0.16 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.7 @@ -2516,7 +2527,7 @@ default-package-overrides: - wai-cors ==0.2.7 - wai-enforce-https ==0.0.2.1 - wai-eventsource ==3.0.0 - - wai-extra ==3.1.3 + - wai-extra ==3.1.4.1 - wai-feature-flags ==0.1.0.1 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.3.6 @@ -2543,7 +2554,7 @@ default-package-overrides: - webex-teams-pipes ==0.2.0.1 - webgear-server ==0.2.0 - webrtc-vad ==0.1.0.3 - - websockets ==0.12.7.1 + - websockets ==0.12.7.2 - websockets-snap ==0.10.3.1 - weigh ==0.0.16 - wide-word ==0.1.1.1 @@ -2551,7 +2562,7 @@ default-package-overrides: - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==0.0.0.3 + - witch ==0.0.0.4 - witherable-class ==0 - within ==0.2.0.1 - with-location ==0.1.0 @@ -2616,6 +2627,8 @@ default-package-overrides: - yesod-form ==1.6.7 - yesod-gitrev ==0.2.1 - yesod-newsfeed ==1.7.0.0 + - yesod-page-cursor ==2.0.0.0 + - yesod-paginator ==1.1.1.0 - yesod-persistent ==1.6.0.5 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.1.0 @@ -3137,9 +3150,6 @@ broken-packages: - aos-signature - aosd - apart - - apecs-gloss - - apecs-physics - - apecs-physics-gloss - apecs-stm - apelsin - api-builder @@ -3392,6 +3402,7 @@ broken-packages: - bbi - BCMtools - bcp47 + - bcp47-orphans - bdcs - bdcs-api - bdd @@ -3642,9 +3653,7 @@ broken-packages: - broker-haskell - bronyradiogermany-common - bronyradiogermany-streaming - - brotli - brotli-conduit - - brotli-streams - browscap - bsd-sysctl - bson @@ -4223,6 +4232,7 @@ broken-packages: - cookies - coordinate - copilot + - copilot-c99 - copilot-cbmc - copilot-language - copilot-libraries @@ -4312,7 +4322,6 @@ broken-packages: - cryptocipher - cryptocompare - cryptoconditions - - cryptohash-sha512 - cryptoids - cryptoids-class - cryptoids-types @@ -4927,7 +4936,6 @@ broken-packages: - EsounD - espial - ess - - essence-of-live-coding-warp - estimators - EstProgress - estreps @@ -5080,7 +5088,9 @@ broken-packages: - fei-base - fei-cocoapi - fei-dataiter + - fei-datasets - fei-examples + - fei-modelzoo - fei-nn - feldspar-compiler - feldspar-language @@ -5167,7 +5177,6 @@ broken-packages: - flamethrower - flamingra - flashblast - - flat - flat-maybe - flatbuffers - flay @@ -5530,7 +5539,6 @@ broken-packages: - github-webhook-handler-snap - githud - gitignore - - gitit - gitlab-api - gitlib - gitlib-cmdline @@ -5689,7 +5697,6 @@ broken-packages: - gray-code - greencard - greencard-lib - - greenclip - greg-client - gremlin-haskell - Grempa @@ -6390,7 +6397,6 @@ broken-packages: - hlrdb - hlrdb-core - hls - - hls-brittany - hlwm - hly - hmark @@ -6440,7 +6446,6 @@ broken-packages: - hogre - hogre-examples - hois - - hoist-error - hol - hold-em - hole @@ -7703,6 +7708,7 @@ broken-packages: - mahoro - maid - mail-pool + - mail-reports - mailchimp - mailchimp-subscribe - MailchimpSimple @@ -8508,7 +8514,6 @@ broken-packages: - pandoc-filter-graphviz - pandoc-filter-indent - pandoc-include - - pandoc-include-code - pandoc-japanese-filters - pandoc-lens - pandoc-markdown-ghci-filter @@ -8858,6 +8863,7 @@ broken-packages: - postgresql-syntax - postgresql-tx-query - postgresql-tx-squeal + - postgresql-tx-squeal-compat-simple - postgresql-typed-lifted - postgrest - postgrest-ws @@ -10385,7 +10391,6 @@ broken-packages: - Tablify - tabloid - tabs - - taffybar - tag-bits - tag-stream - tagged-exception-core @@ -10446,6 +10451,7 @@ broken-packages: - tds - TeaHS - teams + - techlab - teeth - telegram - telegram-api @@ -11506,6 +11512,7 @@ broken-packages: - yxdb-utils - Z-Data - Z-IO + - Z-YAML - z3-encoding - z85 - zabt diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 530e2707a2a95..edf463d360e30 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -662,33 +662,9 @@ self: super: builtins.intersectAttrs super { spago = let - # Spago needs a small patch to work with the latest versions of rio. - # https://github.com/purescript/spago/pull/647 - spagoWithPatches = overrideCabal (appendPatch super.spago ( - # Spago-0.17 needs a small patch to work with the latest version of dhall. - # This can probably be removed with Spago-0.18. - # https://github.com/purescript/spago/pull/695 - pkgs.fetchpatch { - url = "https://github.com/purescript/spago/commit/6258ac601480e776c215c989cc5faae46d5ca9f7.patch"; - sha256 = "02zy4jf24qlqz9fkcs2rqg64ijd8smncmra8s5yp2mln4dmmii1k"; - } - )) (old: { - # The above patch contains a completely new spago.cabal file, but our - # source tree from Hackage already contains a cabal file. Delete the - # local cabal file and just take the one from the patch. - # - # WARNING: The empty line above the `rm` needs to be kept. - prePatch = old.prePatch or "" + '' - - rm spago.cabal - ''; - # The above patch also adds a dependency on the stringsearch package. - libraryHaskellDepends = old.libraryHaskellDepends or [] ++ [ self.stringsearch ]; - }); - # spago requires an older version of megaparsec, but it appears to work # fine with newer versions. - spagoWithOverrides = doJailbreak spagoWithPatches; + spagoWithOverrides = doJailbreak super.spago; # This defines the version of the purescript-docs-search release we are using. # This is defined in the src/Spago/Prelude.hs file in the spago source. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 85711a041b5b6..01ecb362709ca 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -800,7 +800,7 @@ self: { , filepath, geniplate-mirror, ghc-compact, gitrev, happy, hashable , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process , regex-tdfa, split, stm, strict, template-haskell, text, time - , transformers, unordered-containers, uri-encode, zlib + , unordered-containers, uri-encode, zlib }: mkDerivation { pname = "Agda"; @@ -815,7 +815,7 @@ self: { containers data-hash deepseq directory edit-distance equivalence exceptions filepath geniplate-mirror ghc-compact gitrev hashable hashtables haskeline ieee754 mtl murmur-hash pretty process - regex-tdfa split stm strict template-haskell text time transformers + regex-tdfa split stm strict template-haskell text time unordered-containers uri-encode zlib ]; libraryToolDepends = [ alex happy ]; @@ -9248,17 +9248,18 @@ self: { }) {}; "HSmarty" = callPackage - ({ mkDerivation, aeson, attoparsec, attoparsec-expr, base, HTF - , HTTP, mtl, scientific, text, unordered-containers, vector + ({ mkDerivation, aeson, attoparsec, attoparsec-expr, base + , bytestring, filepath, Glob, HTF, HTTP, mtl, scientific, text + , unordered-containers, vector }: mkDerivation { pname = "HSmarty"; - version = "0.2.0.3"; - sha256 = "07m7xpwv565cf78qyqkd6babpl2b7jnq88psv55jclzdqlsvv0rq"; + version = "0.4.1"; + sha256 = "1rfpghc9wl1b4zs5q2k4ndkvxhf6bc5qkm6vfvlfy64c79q96mq3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson attoparsec attoparsec-expr base HTTP mtl scientific text - unordered-containers vector + aeson attoparsec attoparsec-expr base bytestring filepath Glob HTTP + mtl scientific text unordered-containers vector ]; testHaskellDepends = [ aeson attoparsec base HTF text ]; description = "Small template engine"; @@ -9395,8 +9396,8 @@ self: { pname = "HTTP"; version = "4000.3.15"; sha256 = "150m5v125s4jrxzl85jhnh69kp4mjyzhkqp0c1k087008f73csqd"; - revision = "1"; - editedCabalFile = "1nqwz6ns014z23n96567bf6a27if9ss5bj53grcdlmry6lrjad1v"; + revision = "2"; + editedCabalFile = "1rkazrbxfpx7bhp6fhgx97j58i4ccyp8bxjgdhr33cpv1b2cza9b"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -10082,18 +10083,17 @@ self: { }) {}; "HaskellNet" = callPackage - ({ mkDerivation, array, base, base64-string, bytestring, cryptohash - , mime-mail, mtl, network, old-time, pretty, text + ({ mkDerivation, array, base, base64-string, bytestring + , cryptohash-md5, mime-mail, mtl, network, network-bsd, old-time + , pretty, text }: mkDerivation { pname = "HaskellNet"; - version = "0.5.1"; - sha256 = "0f581izyh6bdk85i0g07xdp3fdzdfdfjiqpnl89r17vgswdd6i9j"; - revision = "1"; - editedCabalFile = "12p3v58jhr54yzsmqgza3rbrp19w2iq5m43g568hcx20n7zwzwjk"; + version = "0.5.3"; + sha256 = "0x3radqf6bbqijic8wsnwjlnrkij335rgg41f8jvxif11bn3rlns"; libraryHaskellDepends = [ - array base base64-string bytestring cryptohash mime-mail mtl - network old-time pretty text + array base base64-string bytestring cryptohash-md5 mime-mail mtl + network network-bsd old-time pretty text ]; description = "Client support for POP3, SMTP, and IMAP"; license = stdenv.lib.licenses.bsd3; @@ -17579,6 +17579,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "SJW" = callPackage + ({ mkDerivation, attoparsec, base, Cabal, containers, directory + , filepath, mtl, optparse-applicative, random, text, time, unix + }: + mkDerivation { + pname = "SJW"; + version = "0.1.2.2"; + sha256 = "0ffwlsm8ynmi1nyx1a8j65p9llk7s68g3srkgk1i47rvddn70h6q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base containers directory filepath mtl random text time + unix + ]; + executableHaskellDepends = [ + attoparsec base optparse-applicative text + ]; + testHaskellDepends = [ base Cabal directory filepath random ]; + benchmarkHaskellDepends = [ base directory filepath random time ]; + description = "The Simple Javascript Wrench"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "SMTPClient" = callPackage ({ mkDerivation, base, containers, extensible-exceptions, hsemail , network, old-locale, old-time @@ -18891,10 +18914,8 @@ self: { }: mkDerivation { pname = "Spock"; - version = "0.13.0.0"; - sha256 = "1l0sff6xq99hvcmr2fnsr2x6lbzcpynyjl7n21ycv0l9xgfs6wwa"; - revision = "1"; - editedCabalFile = "1glpfh1w9zahfwi4nc7kbxd429ni9xwvx3cd880mi3zdixlz4ghn"; + version = "0.14.0.0"; + sha256 = "19zqang5ixnfhqrdy70myqn8p1ijd24qfhnmj4w1f9hdr38kmz11"; libraryHaskellDepends = [ base base64-bytestring bytestring containers cryptonite focus hashable http-types hvect list-t monad-control mtl reroute @@ -18915,8 +18936,8 @@ self: { ({ mkDerivation, aeson, base, deepseq, hvect, reroute }: mkDerivation { pname = "Spock-api"; - version = "0.12.0.1"; - sha256 = "0mg5r6rdcgy1yc1lx739bwhlndwyfb9hx0dcwqii7a5sy20qy960"; + version = "0.14.0.0"; + sha256 = "1wqbq8vgq5sifybw32prkmcjwm2dqz4z3sv8ci4s603a2sril7h7"; libraryHaskellDepends = [ aeson base deepseq hvect reroute ]; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; @@ -18928,8 +18949,8 @@ self: { }: mkDerivation { pname = "Spock-api-ghcjs"; - version = "0.12.0.1"; - sha256 = "1n03ax4iwz58b4myh8jwkixiclpiyvx55h247248xfh6a0xr96l0"; + version = "0.14.0.0"; + sha256 = "1ks2a8z2zav84qi9fkpp7pdl6bjbpn9j8h8mcfg5xb2h0p8000fc"; libraryHaskellDepends = [ aeson base bytestring ghcjs-base hvect Spock-api text ]; @@ -18943,8 +18964,8 @@ self: { ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }: mkDerivation { pname = "Spock-api-server"; - version = "0.12.0.1"; - sha256 = "14si03c1xcjfhmjpv717x4ipbd5x7h2sqrld7nnh0pgajzfx8m08"; + version = "0.14.0.0"; + sha256 = "0ra8y036vilsb75jb0lsfbdraygz6jm7b5l9002n7ixypbp2adya"; libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ]; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; @@ -18965,21 +18986,21 @@ self: { "Spock-core" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , case-insensitive, containers, cookie, directory, hashable, hspec - , hspec-wai, http-api-data, http-types, hvect, monad-control, mtl + , case-insensitive, containers, cookie, hashable, hspec, hspec-wai + , http-api-data, http-types, hvect, mmorph, monad-control, mtl , old-locale, reroute, resourcet, stm, superbuffer, text, time , transformers, transformers-base, unordered-containers, vault, wai , wai-extra, warp }: mkDerivation { pname = "Spock-core"; - version = "0.13.0.0"; - sha256 = "0qjiv0jqs3bsgx6mpflsykr2rpvw5cch5v7r6z5306ccli1bvjjy"; + version = "0.14.0.0"; + sha256 = "0bcxngy33wap9py3y4f6kjysl31yjz3qmkp6z5z6pka80x9w3sf7"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers - cookie directory hashable http-api-data http-types hvect - monad-control mtl old-locale reroute resourcet stm superbuffer text - time transformers transformers-base unordered-containers vault wai + cookie hashable http-api-data http-types hvect mmorph monad-control + mtl old-locale reroute resourcet stm superbuffer text time + transformers transformers-base unordered-containers vault wai wai-extra warp ]; testHaskellDepends = [ @@ -21808,25 +21829,26 @@ self: { }) {inherit (pkgs) readline;}; "Z-Data" = callPackage - ({ mkDerivation, base, case-insensitive, deepseq, ghc-prim + ({ mkDerivation, base, Cabal, case-insensitive, deepseq, ghc-prim , hashable, hspec, hspec-discover, HUnit, integer-gmp, primitive , QuickCheck, quickcheck-instances, scientific, tagged , template-haskell, unordered-containers, word8 }: mkDerivation { pname = "Z-Data"; - version = "0.1.9.1"; - sha256 = "0fwbgcsfay83lp24m9afdvn43xlzxi3y74fsxxw2xbfaz6zmxivi"; + version = "0.2.0.0"; + sha256 = "1bxnbbcm3vwsklhhyf10z6i91mpymxh9rw2r64hmfy6yay2b2p0d"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base case-insensitive deepseq ghc-prim hashable integer-gmp primitive QuickCheck scientific tagged template-haskell unordered-containers ]; - libraryToolDepends = [ hspec-discover ]; testHaskellDepends = [ base hashable hspec HUnit integer-gmp primitive QuickCheck quickcheck-instances scientific word8 ]; + testToolDepends = [ hspec-discover ]; description = "Array, vector and text"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -21841,8 +21863,8 @@ self: { }: mkDerivation { pname = "Z-IO"; - version = "0.1.9.0"; - sha256 = "1f9774065arknwm8f1avq7v769cfa610dy45winva3ys4345xcyy"; + version = "0.2.0.0"; + sha256 = "1d3z9869xawzp1wxkz0vm5fkc3071cv5sz6bmr8fdwyw8cd0r7dy"; libraryHaskellDepends = [ base containers exceptions primitive stm time unix-time unordered-containers Z-Data @@ -21859,6 +21881,24 @@ self: { broken = true; }) {}; + "Z-YAML" = callPackage + ({ mkDerivation, base, primitive, scientific, transformers + , unordered-containers, Z-Data, Z-IO + }: + mkDerivation { + pname = "Z-YAML"; + version = "0.1.0.0"; + sha256 = "0jw8mzw1xnyzagx5d6i532r4isr63g1mq00bhfp3mvhc75hf9ghr"; + libraryHaskellDepends = [ + base primitive scientific transformers unordered-containers Z-Data + Z-IO + ]; + description = "YAML tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ZEBEDDE" = callPackage ({ mkDerivation, base, vect }: mkDerivation { @@ -24062,8 +24102,8 @@ self: { }: mkDerivation { pname = "advent-of-code-api"; - version = "0.2.7.1"; - sha256 = "1amm7gvr04ndfw6b0jxy8wsa35lqbfb85wp9bn9kycd8qp6vq9cs"; + version = "0.2.8.0"; + sha256 = "1g1wybpir0053pjav8czccnva38jr35gnii1as0lbyinc1k7vlhq"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath finite-typelits http-api-data http-client http-client-tls @@ -24084,8 +24124,8 @@ self: { }: mkDerivation { pname = "advent-of-code-ocr"; - version = "0.1.1.0"; - sha256 = "0kzmm901yz262dblwv1wxf86h1jm8m2x1ky1gqvj03lck598fqz7"; + version = "0.1.2.0"; + sha256 = "0ppa386cbcdwx2k12ya19fsjlrgqgljdryv4mb3a0lrk44804k5c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24591,6 +24631,8 @@ self: { pname = "aeson-injector"; version = "1.1.5.0"; sha256 = "0hg853hhbvmqa6yj0xg8naxdrbs2n3lzld0jrbmfmccjqcfzarx4"; + revision = "1"; + editedCabalFile = "0l1628z78sxi1wjh1x3hymaid2f7g4r4sbs28phg127fzwn4i7ma"; libraryHaskellDepends = [ aeson base bifunctors deepseq hashable lens servant-docs swagger2 text unordered-containers @@ -25868,6 +25910,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "alex_3_2_6" = callPackage + ({ mkDerivation, array, base, containers, directory, happy, process + }: + mkDerivation { + pname = "alex"; + version = "3.2.6"; + sha256 = "042lrkn0dbpjn5ivj6j26jzb1fwrj8c1aj18ykxja89isg0hiali"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ array base containers directory ]; + executableToolDepends = [ happy ]; + testHaskellDepends = [ base process ]; + description = "Alex is a tool for generating lexical analysers in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "alex-meta" = callPackage ({ mkDerivation, alex, array, base, containers, happy , haskell-src-meta, QuickCheck, template-haskell @@ -26148,6 +26208,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "algebraic-graphs-io" = callPackage + ({ mkDerivation, algebraic-graphs, attoparsec, base, binary + , binary-conduit, bytestring, conduit, conduit-extra, containers + , csv-conduit, dot, exceptions, filepath, hspec, http-conduit + , matrix-market-attoparsec, megaparsec, parser-combinators + , primitive, QuickCheck, tar-conduit, text, vector + }: + mkDerivation { + pname = "algebraic-graphs-io"; + version = "0.1.5.1"; + sha256 = "03hiwyqfkd1s4r7w3cbw64333clpbpxpbppskjvk5knkv8r2mx78"; + libraryHaskellDepends = [ + algebraic-graphs attoparsec base binary binary-conduit bytestring + conduit conduit-extra containers csv-conduit dot exceptions + filepath http-conduit matrix-market-attoparsec megaparsec + parser-combinators primitive tar-conduit text vector + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "I/O utilities and datasets for algebraic-graphs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "algebraic-prelude" = callPackage ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }: mkDerivation { @@ -29404,6 +29486,28 @@ self: { license = "GPL"; }) {}; + "anagrep" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , criterion, deepseq, ghc-prim, hspec, integer-gmp, QuickCheck + , regex-tdfa, vector + }: + mkDerivation { + pname = "anagrep"; + version = "0.1.0.0"; + sha256 = "1pqp3q8pr2j0v1ra83glfbbclq6yd6vns0q9q8i9r4kd7lrd2vrm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base case-insensitive containers deepseq ghc-prim integer-gmp + regex-tdfa vector + ]; + executableHaskellDepends = [ base bytestring case-insensitive ]; + testHaskellDepends = [ base case-insensitive hspec QuickCheck ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + description = "Find strings with permutations (anagrams) that match a regular expression"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "analyze" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cassava , exceptions, foldl, free, hashable, lucid, QuickCheck, tasty @@ -30671,8 +30775,6 @@ self: { ]; description = "Simple gloss renderer for apecs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "apecs-physics" = callPackage @@ -30689,8 +30791,23 @@ self: { ]; description = "2D physics for apecs"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "apecs-physics_0_4_5" = callPackage + ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear + , template-haskell, vector + }: + mkDerivation { + pname = "apecs-physics"; + version = "0.4.5"; + sha256 = "1ksxx5x998csgi3lr2yl18mk5sjccin20b15swyx1g9k7fsm7nx5"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + apecs base containers inline-c linear template-haskell vector + ]; + description = "2D physics for apecs"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "apecs-physics-gloss" = callPackage @@ -30702,8 +30819,6 @@ self: { libraryHaskellDepends = [ apecs apecs-physics base gloss ]; description = "Gloss rendering for apecs-physics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "apecs-stm" = callPackage @@ -30786,6 +30901,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "api-maker" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, http-client + , http-client-tls, http-types, lens, monad-control, mtl, req, text + , transformers, transformers-base + }: + mkDerivation { + pname = "api-maker"; + version = "0.1.0.0"; + sha256 = "02rkmyq1zrjklklfqpj1413j3fb0c61y28pwj06z24i71d5nmy6r"; + libraryHaskellDepends = [ + aeson base bytestring containers http-client http-client-tls + http-types lens monad-control mtl req text transformers + transformers-base + ]; + testHaskellDepends = [ + aeson base bytestring containers http-client http-client-tls + http-types lens monad-control mtl req text transformers + transformers-base + ]; + description = "Package to make APIs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "api-monobank" = callPackage ({ mkDerivation, aeson, base, bytestring, hs-coindesk-api , http-client, http-client-tls, http-conduit, servant @@ -31924,30 +32062,31 @@ self: { "arch-hs" = callPackage ({ mkDerivation, aeson, algebraic-graphs, base, bytestring, Cabal - , colourista, conduit, conduit-extra, containers, deepseq - , directory, filepath, hackage-db, megaparsec, microlens - , microlens-th, neat-interpolation, optparse-applicative, polysemy - , req, split, tar-conduit, template-haskell, text + , conduit, conduit-extra, containers, deepseq, Diff, directory + , filepath, hackage-db, megaparsec, microlens, microlens-th + , neat-interpolation, optparse-applicative, polysemy, prettyprinter + , prettyprinter-ansi-terminal, req, split, tar-conduit + , template-haskell, text }: mkDerivation { pname = "arch-hs"; - version = "0.5.0.0"; - sha256 = "04w0b8ivwrm1g0qg0pym7qap4ggzv6ng9x6jy5k2nnbmpck07597"; + version = "0.6.1.0"; + sha256 = "0ps8mxgy5cgrpcr0dy55biqj5a3j2bj44x6cfxx63fyv2j06lgdv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson algebraic-graphs base bytestring Cabal colourista conduit - conduit-extra containers deepseq directory filepath hackage-db - megaparsec microlens microlens-th neat-interpolation - optparse-applicative polysemy req split tar-conduit - template-haskell text + aeson algebraic-graphs base bytestring Cabal conduit conduit-extra + containers deepseq Diff directory filepath hackage-db megaparsec + microlens microlens-th neat-interpolation optparse-applicative + polysemy prettyprinter prettyprinter-ansi-terminal req split + tar-conduit template-haskell text ]; executableHaskellDepends = [ - aeson algebraic-graphs base bytestring Cabal colourista conduit - conduit-extra containers deepseq directory filepath hackage-db - megaparsec microlens microlens-th neat-interpolation - optparse-applicative polysemy req split tar-conduit - template-haskell text + aeson algebraic-graphs base bytestring Cabal conduit conduit-extra + containers deepseq Diff directory filepath hackage-db megaparsec + microlens microlens-th neat-interpolation optparse-applicative + polysemy prettyprinter prettyprinter-ansi-terminal req split + tar-conduit template-haskell text ]; description = "Distribute hackage packages to archlinux"; license = stdenv.lib.licenses.mit; @@ -32345,8 +32484,8 @@ self: { }: mkDerivation { pname = "arion-compose"; - version = "0.1.1.1"; - sha256 = "0qi9mj67j3kq02psm3qa855rk0hpz2pvfa7ggx4jhzqnf60xd9ph"; + version = "0.1.2.0"; + sha256 = "1vginzc90xl8fs1pr9qvw7fjj207vjb1k3rxa341hq7q5pri2y3d"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -32917,8 +33056,8 @@ self: { ({ mkDerivation, base, parsec, split, tagsoup }: mkDerivation { pname = "arxiv"; - version = "0.0.2"; - sha256 = "0lzmw35fry16zv8fbnqw3k5wv4d6vh9f0fz2yv9kph7zgs5sqgwh"; + version = "0.0.3"; + sha256 = "1rvzxbknmjcgx1209v265d4zar75y9637zi6alk1y3dg5lhbgm89"; libraryHaskellDepends = [ base parsec split tagsoup ]; description = "A client for the Arxiv API"; license = "LGPL"; @@ -33633,8 +33772,8 @@ self: { pname = "ast-monad"; version = "0.1.0.0"; sha256 = "038cvblhhlcsv9id2rcb26q4lwvals3xj45j9jy6fb69jm5mzh0i"; - revision = "4"; - editedCabalFile = "131ynmpy5y0c4maj0cp0n3sbbs4k40j7dybgcsad5kv58i63kw23"; + revision = "5"; + editedCabalFile = "1llhzaacz47f1cmjr3q4zsq5i0fi8q0vbqxgsb8vqfrnvddx0bz6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A library for constructing AST by using do-notation"; @@ -33649,8 +33788,8 @@ self: { pname = "ast-monad-json"; version = "0.1.0.1"; sha256 = "0a0pzcma574rrx6klfgk16y6ng22glwj1l5c3rz5w32a22ildfz6"; - revision = "2"; - editedCabalFile = "0cbayikyr96vcn10253gkwgk0mvx6inymrldv0bhzp8qiv94sm3n"; + revision = "3"; + editedCabalFile = "01gvbidiiy20vdxgdbv3938zgvmwx8gz3nc54cgq57b36h2dl0ik"; libraryHaskellDepends = [ ast-monad base text ]; testHaskellDepends = [ ast-monad base hspec text ]; description = "A library for writing JSON"; @@ -34174,27 +34313,27 @@ self: { }) {}; "atom-conduit" = callPackage - ({ mkDerivation, base-noprelude, blaze-builder, conduit - , data-default, filepath, generic-random, microlens, microlens-th - , parsers, pretty-simple, prettyprinter, QuickCheck - , quickcheck-instances, refined, relude, resourcet, safe-exceptions - , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text, time - , timerep, uri-bytestring, xml-conduit, xml-types + ({ mkDerivation, base, blaze-builder, conduit, data-default + , filepath, generic-random, microlens, microlens-th, parsers + , pretty-simple, prettyprinter, QuickCheck, quickcheck-instances + , refined, relude, resourcet, safe-exceptions, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, time, timerep + , uri-bytestring, xml-conduit, xml-types }: mkDerivation { pname = "atom-conduit"; - version = "0.9.0.0"; - sha256 = "0kjdw3x5jsa5hjb36zq93xyp3ac1s4j5vpb52969hckcghmyrabm"; + version = "0.9.0.1"; + sha256 = "1fbvs522x9ldpmp1qr57vsanbdhqfi4m4cs2gk3pm5vmnnqqpqb4"; libraryHaskellDepends = [ - base-noprelude blaze-builder conduit microlens microlens-th parsers + base blaze-builder conduit microlens microlens-th parsers prettyprinter refined relude safe-exceptions text time timerep uri-bytestring xml-conduit xml-types ]; testHaskellDepends = [ - base-noprelude conduit data-default filepath generic-random - microlens pretty-simple QuickCheck quickcheck-instances refined - relude resourcet tasty tasty-golden tasty-hunit tasty-quickcheck - text time uri-bytestring xml-conduit xml-types + base conduit data-default filepath generic-random microlens + pretty-simple QuickCheck quickcheck-instances refined relude + resourcet tasty tasty-golden tasty-hunit tasty-quickcheck text time + uri-bytestring xml-conduit xml-types ]; description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; license = stdenv.lib.licenses.cc0; @@ -37369,12 +37508,12 @@ self: { broken = true; }) {}; - "base_4_14_0_0" = callPackage + "base_4_14_1_0" = callPackage ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }: mkDerivation { pname = "base"; - version = "4.14.0.0"; - sha256 = "108bg791pplf1mlc6x95jza6hq28yc5s8a8vv8fxvn33vwm058an"; + version = "4.14.1.0"; + sha256 = "15n0ya681yvfvccswcxxk855qv7wz886rmnabj0y6ah7mbf8aijs"; libraryHaskellDepends = [ ghc-prim invalid-cabal-flag-settings rts ]; @@ -37498,8 +37637,8 @@ self: { }: mkDerivation { pname = "base-orphans"; - version = "0.8.3"; - sha256 = "1d9yrxrl270wjpq9iwy1a1faicc650njpr3d3ffn76kqgnn33alv"; + version = "0.8.4"; + sha256 = "1cxvjcyy0vsg21n85gxal03gfprw75vjd1h9sni00d60as9vbcip"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -37752,19 +37891,16 @@ self: { }) {}; "base62" = callPackage - ({ mkDerivation, base, byteslice, doctest, natural-arithmetic - , primitive, small-bytearray-builder, tasty, tasty-hunit + ({ mkDerivation, base, bytebuild, byteslice, doctest + , natural-arithmetic, primitive, tasty, tasty-hunit , tasty-quickcheck, wide-word }: mkDerivation { pname = "base62"; - version = "0.1.0.0"; - sha256 = "1ns8hr9xjmrlq5lgi47630gpn8xdglk33ncqw4kjvdrb1x90iz0p"; - revision = "2"; - editedCabalFile = "0i1ipcawbnjf0mjdva4q8s2kw4hd4lfnygmvc81sjxd9crlwy4vm"; + version = "0.1.0.1"; + sha256 = "0jfxbg9il8wiaaxdxjkp5kk6jph2b12qi9aiilb1y23h67lxmh2h"; libraryHaskellDepends = [ - base byteslice natural-arithmetic primitive small-bytearray-builder - wide-word + base bytebuild byteslice natural-arithmetic primitive wide-word ]; testHaskellDepends = [ base byteslice doctest primitive tasty tasty-hunit tasty-quickcheck @@ -38427,8 +38563,8 @@ self: { }: mkDerivation { pname = "bcp47"; - version = "0.1.0.0"; - sha256 = "1cy2wdp97mvyg1fvkmi6vzd8vd9v8645nd5cfzgp4whhy0v5y7rj"; + version = "0.2.0.0"; + sha256 = "0dbbpxjhsm17xhqp2a4vvwb0rq3v33wmb84rqdcjr6j8d54wnq5f"; libraryHaskellDepends = [ aeson base containers country generic-arbitrary iso639 megaparsec QuickCheck text @@ -38442,6 +38578,27 @@ self: { broken = true; }) {}; + "bcp47-orphans" = callPackage + ({ mkDerivation, base, bcp47, cassava, errors, esqueleto, hashable + , hspec, http-api-data, path-pieces, persistent, QuickCheck, text + }: + mkDerivation { + pname = "bcp47-orphans"; + version = "0.1.0.1"; + sha256 = "0phw6hsrhya93w7zlrl7866zgpa62pscicjdb5lllpdqfcwl4jl2"; + libraryHaskellDepends = [ + base bcp47 cassava errors esqueleto hashable http-api-data + path-pieces persistent text + ]; + testHaskellDepends = [ + base bcp47 cassava hspec path-pieces persistent QuickCheck + ]; + description = "BCP47 orphan instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "bcrypt" = callPackage ({ mkDerivation, base, bytestring, data-default, entropy, memory }: mkDerivation { @@ -38618,8 +38775,8 @@ self: { }: mkDerivation { pname = "beam-automigrate"; - version = "0.1.1.0"; - sha256 = "14h8zbxyrkhajjbhjmdib9s99xv0bmar4s6gb4mpqkvhakj7a76n"; + version = "0.1.2.0"; + sha256 = "1y7i553zwm46k39k72l400rh2g8k6k2crjj2wdmkn9nndv1x7545"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39379,15 +39536,16 @@ self: { }: mkDerivation { pname = "bglib"; - version = "2.0.0.0"; - sha256 = "1h9ql3xz5yciwk2hd1mljql0avrqv66fswdl8bll0xpga7jnpvr8"; + version = "3.0.0.0"; + sha256 = "1v82kj5ccznky4v4pffnjqzvai54wn2lcfkb2gnzxrn6gzn261a9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base binary bytestring monad-loops mtl serialport stm ]; executableHaskellDepends = [ - async base bytestring mtl optparse-applicative serialport stm + async base binary bytestring monad-loops mtl optparse-applicative + serialport stm ]; description = "Implementation of the BGAPI serial protocol"; license = stdenv.lib.licenses.mit; @@ -40873,6 +41031,17 @@ self: { broken = true; }) {g15 = null;}; + "bindings-libpci" = callPackage + ({ mkDerivation, base, bindings-DSL }: + mkDerivation { + pname = "bindings-libpci"; + version = "0.4.0.0"; + sha256 = "18vjsgvndmxbxvyapxkgkx36qgh2yrdg8dfaqpcd9zr3yl84kxnq"; + libraryHaskellDepends = [ base bindings-DSL ]; + description = "Low level bindings to libpci"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bindings-librrd" = callPackage ({ mkDerivation, base, bindings-DSL, librrd }: mkDerivation { @@ -41711,8 +41880,8 @@ self: { }: mkDerivation { pname = "bishbosh"; - version = "0.0.0.6"; - sha256 = "0gax0q1i86m0zb3gwfwmy59z8jnpri96dd9y73xbjyy4cjnwc32m"; + version = "0.0.0.7"; + sha256 = "1ihnq7smjk0d18gmkgl70qzqwljmb5nr9hhzwfmkakh3p2x24g3i"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -42591,8 +42760,8 @@ self: { }: mkDerivation { pname = "bitwise-enum"; - version = "1.0.0.1"; - sha256 = "0y7x2yyvbdvwg5g5rrl9dbh2syvl1y74pwlccq2w2v5rhr8ql2cb"; + version = "1.0.0.2"; + sha256 = "1y63qpxkh8k019vj2b1qz1jnssld5lik5cjhf6dzj2bal4013lii"; libraryHaskellDepends = [ aeson array base deepseq mono-traversable vector ]; @@ -43322,6 +43491,21 @@ self: { broken = true; }) {}; + "blindpass" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "blindpass"; + version = "0.1.0"; + sha256 = "0pi0k02xq25n9mjphyq357mna0d5jn67xhzjyafaa4q09g4vy1ay"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "Password entry tool"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "blink1" = callPackage ({ mkDerivation, base, bytestring, text, unix, usb, vector }: mkDerivation { @@ -45031,6 +45215,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "brick_0_58" = callPackage + ({ mkDerivation, base, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, dlist, exceptions + , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm + , template-haskell, text, text-zipper, transformers, unix, vector + , vty, word-wrap + }: + mkDerivation { + pname = "brick"; + version = "0.58"; + sha256 = "1rrx8pmffpsgajwmvm8w0kriwhncfih2j2vkla3nqq1vr0kn8518"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring config-ini containers contravariant data-clist + deepseq directory dlist exceptions filepath microlens microlens-mtl + microlens-th stm template-haskell text text-zipper transformers + unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector + ]; + description = "A declarative terminal user interface library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "brick-dropdownmenu" = callPackage ({ mkDerivation, base, brick, containers, microlens, microlens-ghc , microlens-th, pointedlist, vector, vty @@ -45247,8 +45458,8 @@ self: { }: mkDerivation { pname = "brittany"; - version = "0.12.2.0"; - sha256 = "03v7lhy6i7fk3sskimzb3hs9qi1g9b9w7zfvmc9m4606673ysdzl"; + version = "0.13.1.0"; + sha256 = "0dw4s4lcb34fkv4i0rylna6zrr55rgkqs1s75lhn8zskwl7j89bs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45447,9 +45658,8 @@ self: { }) {}; "brotli" = callPackage - ({ mkDerivation, base, bytestring, HUnit, libbrotlidec - , libbrotlienc, QuickCheck, tasty, tasty-hunit, tasty-quickcheck - , transformers + ({ mkDerivation, base, brotli, bytestring, HUnit, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, transformers }: mkDerivation { pname = "brotli"; @@ -45458,15 +45668,13 @@ self: { revision = "2"; editedCabalFile = "0iny0gbb5b3a8n8rpriz7620fnhw70c0pgl615s4b1rhrnj87wrb"; libraryHaskellDepends = [ base bytestring transformers ]; - libraryPkgconfigDepends = [ libbrotlidec libbrotlienc ]; + libraryPkgconfigDepends = [ brotli ]; testHaskellDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Brotli (RFC7932) compression and decompression"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {libbrotlidec = null; libbrotlienc = null;}; + }) {inherit (pkgs) brotli;}; "brotli-conduit" = callPackage ({ mkDerivation, base, brotli, bytestring, conduit, HUnit @@ -45508,8 +45716,6 @@ self: { ]; description = "IO-Streams interface for Brotli (RFC7932) compression"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "browscap" = callPackage @@ -45948,8 +46154,8 @@ self: { }: mkDerivation { pname = "bugsnag-haskell"; - version = "0.0.4.0"; - sha256 = "1vmbyyya221f6nkk6j1wxscwcxmh10f0hwsy9ib460d59vf607ym"; + version = "0.0.4.1"; + sha256 = "0msr61bh2h9ncbar4kwsdpncvaasy3qa3n3vjgqvnsymvs257vaf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47340,8 +47546,8 @@ self: { ({ mkDerivation, base, Cabal, HUnit, QuickCheck, safe }: mkDerivation { pname = "byteunits"; - version = "0.4.0.2"; - sha256 = "1mdkpmqwszllz2yyhssic02k5g7m8hwnd5wghi4vf970g6m6skpp"; + version = "0.4.0.3"; + sha256 = "1p28wax0i49c1zka7ijirr75a4y2hg7fpvm7hvvwn7y3npxddd18"; libraryHaskellDepends = [ base safe ]; testHaskellDepends = [ base Cabal HUnit QuickCheck ]; description = "Human friendly conversion between byte units (KB, MB, GB...)"; @@ -47579,8 +47785,8 @@ self: { }: mkDerivation { pname = "c2hs"; - version = "0.28.6"; - sha256 = "1nplgxfin139x12sb656f5870rpdclrhzi8mq8pry035qld15pci"; + version = "0.28.7"; + sha256 = "0ib7ayfn37krsnm710x4gxd2i88xv3djnqa737gbw93b0206l571"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -48226,8 +48432,8 @@ self: { ]; doCheck = false; postInstall = '' - mkdir $out/etc - mv bash-completion $out/etc/bash_completion.d + mkdir -p $out/share/bash-completion + mv bash-completion $out/share/bash-completion/completions ''; description = "The command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; @@ -49473,8 +49679,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.22.1"; - sha256 = "0mwpggxkag3l4ql75yhp5a0mpmwah44a9rqpsln0ds405jydjw92"; + version = "0.1.23.1"; + sha256 = "162vjlzd2w98c5w8smjy6y7sywa7dfmv780g6ij4spzn1611l2z5"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra containers data-default-class data-flags deepseq deque df1 di-core di-polysemy @@ -49636,8 +49842,8 @@ self: { }: mkDerivation { pname = "call-alloy"; - version = "0.2.1.0"; - sha256 = "0k75fcrn2r4yk59i8r7qwirg0b9vwga9gmibmj4lznqg44yy2bhi"; + version = "0.2.1.1"; + sha256 = "0vgn4rrpnhmjcn7wh01nr4q0mlmr4ja2dd1b9vysxfrmslfxnxda"; libraryHaskellDepends = [ base bytestring containers directory file-embed filepath hashable lens mtl process split trifecta unix @@ -50083,34 +50289,34 @@ self: { , deepseq, directory, exceptions, filepath, focus, hashable , heredoc, hspec, list-t, monad-stm, mtl, network, network-simple , pretty-show, primitive, process, process-extras, QuickCheck - , quickcheck-instances, quickcheck-io, reinterpret-cast, resourcet - , safe-exceptions, stm, stm-containers, supervisors, text + , quickcheck-instances, quickcheck-io, resourcet, safe-exceptions + , stm, stm-containers, supervisors, template-haskell, text , transformers, vector, wl-pprint-text }: mkDerivation { pname = "capnp"; - version = "0.8.0.0"; - sha256 = "0jqq1yal41rnc8z66b24kiycyxdzwpqykx1p8v1rc3qbn4i3n255"; + version = "0.9.0.0"; + sha256 = "0sgbl9rfvw73bb29kxp6q4ba0fxzx3a0kgpkiqhyvvvbr3ycdbqb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base bytes bytestring containers cpu data-default data-default-instances-vector exceptions focus hashable list-t monad-stm mtl network network-simple pretty-show primitive - reinterpret-cast safe-exceptions stm stm-containers supervisors + safe-exceptions stm stm-containers supervisors template-haskell text transformers vector ]; executableHaskellDepends = [ base bifunctors bytes bytestring containers data-default directory - exceptions filepath monad-stm mtl primitive reinterpret-cast - safe-exceptions text transformers vector wl-pprint-text + exceptions filepath monad-stm mtl primitive safe-exceptions text + transformers vector wl-pprint-text ]; testHaskellDepends = [ async base bytes bytestring containers data-default deepseq directory exceptions heredoc hspec monad-stm mtl network network-simple pretty-show primitive process process-extras - QuickCheck quickcheck-instances quickcheck-io reinterpret-cast - resourcet safe-exceptions stm supervisors text transformers vector + QuickCheck quickcheck-instances quickcheck-io resourcet + safe-exceptions stm supervisors text transformers vector ]; description = "Cap'n Proto for Haskell"; license = stdenv.lib.licenses.mit; @@ -52726,6 +52932,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "chassis" = callPackage + ({ mkDerivation, base, bytestring, comonad, composite-base + , containers, contravariant, distributive, either, exceptions + , extra, first-class-families, path, profunctors, rio, text, time + , vinyl + }: + mkDerivation { + pname = "chassis"; + version = "0.0.4.0"; + sha256 = "1mvi7h6pp1j3x4yccqy962f8d3gbm4sj5fvnfwxygnxqqhmy1dvk"; + libraryHaskellDepends = [ + base bytestring comonad composite-base containers contravariant + distributive either exceptions extra first-class-families path + profunctors rio text time vinyl + ]; + description = "Prelude with algebraic constructs and polykinds on"; + license = stdenv.lib.licenses.mit; + }) {}; + "chatter" = callPackage ({ mkDerivation, array, base, bytestring, cereal, cereal-text , containers, deepseq, directory, filepath, fullstop, hashable @@ -53064,16 +53289,46 @@ self: { broken = true; }) {}; + "cherry-core-alpha" = callPackage + ({ mkDerivation, async, base, base64-bytestring, binary, bytestring + , case-insensitive, cherry-core, containers, directory, ghc-prim + , hspec, hspec-discover, http-client, http-client-tls, http-types + , mtl, network, safe-exceptions, scientific, stm, text-utf8, time + , unix, utf8-string, vector, wai, wai-extra, wai-middleware-static + , warp + }: + mkDerivation { + pname = "cherry-core-alpha"; + version = "0.2.0.0"; + sha256 = "1bbf47n263bx9szfxxl0sg158nj4rm04742p0parbh2i4ia2gwmn"; + libraryHaskellDepends = [ + async base base64-bytestring binary bytestring case-insensitive + containers directory ghc-prim http-client http-client-tls + http-types mtl network safe-exceptions scientific stm text-utf8 + time unix utf8-string vector wai wai-extra wai-middleware-static + warp + ]; + testHaskellDepends = [ + base cherry-core containers hspec text-utf8 + ]; + testToolDepends = [ hspec-discover ]; + description = "The core library for Cherry Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {cherry-core = null;}; + "chessIO" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring, containers - , directory, extra, file-embed, haskeline, megaparsec, MonadRandom - , mtl, o-clock, optparse-applicative, parallel, prettyprinter - , process, random, stm, text, time, unordered-containers, vector + ({ mkDerivation, attoparsec, base, binary, brick, bytestring + , containers, directory, extra, file-embed, filepath, haskeline + , megaparsec, microlens, microlens-th, MonadRandom, mtl, o-clock + , optparse-applicative, parallel, prettyprinter, process, random + , rosezipper, stm, text, time, unordered-containers, vector, vty }: mkDerivation { pname = "chessIO"; - version = "0.5.0.0"; - sha256 = "14di8x8r7q2sjwipx8crgr0bcy3qhr58knf6paqkfqsxc3iynr0h"; + version = "0.6.0.0"; + sha256 = "0lc0bif9bp4h0131cy9rss90qv026mlknr16ayxlvfn3ynyarqv8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53082,10 +53337,10 @@ self: { text unordered-containers vector ]; executableHaskellDepends = [ - attoparsec base binary bytestring containers extra file-embed - haskeline megaparsec MonadRandom mtl o-clock optparse-applicative - prettyprinter process random stm text time unordered-containers - vector + attoparsec base binary brick bytestring containers extra file-embed + filepath haskeline megaparsec microlens microlens-th MonadRandom + mtl o-clock optparse-applicative prettyprinter process random + rosezipper stm text time unordered-containers vector vty ]; testHaskellDepends = [ attoparsec base binary bytestring containers directory extra @@ -53183,8 +53438,10 @@ self: { }: mkDerivation { pname = "chiphunk"; - version = "0.1.2.1"; - sha256 = "03mjx286kbxnnsalqii7fbq3zgdbdsb2mr6x334jffif801sjmbq"; + version = "0.1.4.0"; + sha256 = "096pcfszccx9hdzqknrmdzj2lb38059cfqndvyildx2x83dhq5dx"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base hashable safe-exceptions StateVar vector-space ]; @@ -54093,22 +54350,18 @@ self: { }) {}; "circular" = callPackage - ({ mkDerivation, aeson, base, criterion, hspec, hspec-discover - , primitive, QuickCheck, quickcheck-instances, vector + ({ mkDerivation, aeson, base, criterion, hspec, primitive + , QuickCheck, quickcheck-instances, vector }: mkDerivation { pname = "circular"; - version = "0.3.1"; - sha256 = "14fyhqyqv08yml0bsxpjqv3x1alnwdsp9yx5f035vwp9p1mh7rll"; + version = "0.3.1.1"; + sha256 = "0m3hw2w9hrxz7qi4vcqfbvqck6k7rzwv49r3il0i69xkxzr1dcgk"; libraryHaskellDepends = [ aeson base primitive vector ]; testHaskellDepends = [ - aeson base hspec hspec-discover primitive QuickCheck - quickcheck-instances vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - aeson base criterion primitive vector + aeson base hspec primitive QuickCheck quickcheck-instances vector ]; + benchmarkHaskellDepends = [ base criterion vector ]; description = "Circular fixed-sized mutable vectors"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -54186,8 +54439,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.2"; - sha256 = "1jibg9yzcdafijy5c8khgavirbxq44plsw81gkxya24yc9ag5bi6"; + version = "0.3.0.1"; + sha256 = "1jw8277z1qzq9dxb3z9yz18fd1rc4wrwc6hbqigyfr4a17h8psgs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55456,8 +55709,8 @@ self: { }: mkDerivation { pname = "clickhouse-haskell"; - version = "0.1.2.0"; - sha256 = "0mys7l7sncrdwd673p0s4ls3ir5i26kcjl7x0hpd9a4ms8y04fxx"; + version = "0.1.2.3"; + sha256 = "1sa9jbiw8j04plk26p7n25plq0ymzsw7vqln0y6kbn3k30panyqg"; libraryHaskellDepends = [ aeson array async attoparsec base binary bytestring bytestring-to-vector call-stack containers data-default-class @@ -56724,8 +56977,8 @@ self: { }: mkDerivation { pname = "co-log-polysemy-formatting"; - version = "0.1.0.0"; - sha256 = "17dajk3d23xa1fj8qs896szs00vvwpdgcgjibvkw9mm160yvrlxi"; + version = "0.1.1.0"; + sha256 = "0bq16kf0xg1nlif5jk899jawbbgg1lkh0jy6gx46prvqghd05y4s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56733,8 +56986,8 @@ self: { polysemy text time ]; executableHaskellDepends = [ - ansi-terminal base co-log co-log-core co-log-polysemy formatting - polysemy polysemy-plugin text time + base co-log co-log-core co-log-polysemy formatting polysemy + polysemy-plugin ]; description = "A Polysemy logging effect for high quality (unstructured) logs"; license = stdenv.lib.licenses.bsd3; @@ -58411,6 +58664,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "comonad_5_0_7" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers + , distributive, doctest, indexed-traversable, tagged, transformers + , transformers-compat + }: + mkDerivation { + pname = "comonad"; + version = "5.0.7"; + sha256 = "178d0g7f5rx69dniij0ihjv3makgg9zybqnrbwwf3jfknykypgam"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers distributive indexed-traversable tagged + transformers transformers-compat + ]; + testHaskellDepends = [ base doctest ]; + description = "Comonads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "comonad-extras" = callPackage ({ mkDerivation, array, base, comonad, containers, distributive , semigroupoids, transformers @@ -62826,8 +63099,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.1"; - sha256 = "1dw7bkmadwsncd39pkngaxglfsnrnc9km7y8ld0l9bkiiw136x2w"; + version = "3.2"; + sha256 = "1d1b70kal17aiflhvzz59ahc6iyyln3d70xvhjjjh7j7la03xm8h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62842,20 +63115,27 @@ self: { }) {}; "copilot-c99" = callPackage - ({ mkDerivation, base, containers, copilot-core, directory - , filepath, language-c99, language-c99-simple, language-c99-util - , mtl, pretty + ({ mkDerivation, base, containers, copilot-core, copilot-language + , csv, directory, filepath, hspec, language-c99 + , language-c99-simple, language-c99-util, mtl, pretty, process + , QuickCheck }: mkDerivation { pname = "copilot-c99"; - version = "3.1.2"; - sha256 = "1mxkn9mvcxlycrrha023nppn8005n26mqhklcw2hf8l3aq2ij7mf"; + version = "3.2"; + sha256 = "0q0v8xwmcbvi2yvz0nn1kc3ms0i3g74f2k66gwhnznnvldr99qh2"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty ]; + testHaskellDepends = [ + base copilot-core copilot-language csv hspec language-c99 + language-c99-simple pretty process QuickCheck + ]; description = "A compiler for Copilot targeting C99"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "copilot-cbmc" = callPackage @@ -62877,12 +63157,12 @@ self: { }) {}; "copilot-core" = callPackage - ({ mkDerivation, base, containers, dlist, mtl, pretty }: + ({ mkDerivation, base, dlist, mtl, pretty }: mkDerivation { pname = "copilot-core"; - version = "3.1"; - sha256 = "08xz5s0b2fd5igja5wiaq93ignx6bsf942rg4hy42fmh4c03hylp"; - libraryHaskellDepends = [ base containers dlist mtl pretty ]; + version = "3.2"; + sha256 = "0l13zqycini9fkiy90i0dzi831lqv8lwpdk0dzrk9r0c545iy2ga"; + libraryHaskellDepends = [ base dlist mtl pretty ]; description = "An intermediate representation for Copilot"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -62893,8 +63173,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "3.1"; - sha256 = "0hdk8418l30vz9lv7c4bzh8m5gn8knpvg296b14n66si9g36qglp"; + version = "3.2"; + sha256 = "1vx2i20ndphcb7gl252wnk2bim2dcg3552yfa0rpkh8axkiwmnpa"; libraryHaskellDepends = [ array base containers copilot-core copilot-theorem data-reify ghc-prim mtl @@ -62911,8 +63191,8 @@ self: { }: mkDerivation { pname = "copilot-libraries"; - version = "3.1"; - sha256 = "094hjzg22b55n4kv89ccr7pbgqpbd0z8f5myn93nyw6yqpmpp30v"; + version = "3.2"; + sha256 = "0sjl6bk2fzba2zj0m41si0i2jr8pcwf96zc1vscwmhfg48hqxjg1"; libraryHaskellDepends = [ array base containers copilot-language data-reify mtl parsec ]; @@ -62946,8 +63226,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "3.1"; - sha256 = "15vnl5lg9s6h9s98f1nvva3ab0gdn3a5314mxdfxxa53ywmiq2a0"; + version = "3.2"; + sha256 = "1l0vmxlrygvxq23nvjss8x53qlfhbshp5vlh3cs6mviv1hmpbg7v"; libraryHaskellDepends = [ ansi-terminal base bimap containers copilot-core data-default directory mtl parsec pretty process random transformers xml @@ -63351,8 +63631,8 @@ self: { }: mkDerivation { pname = "countable-inflections"; - version = "0.2.0"; - sha256 = "0va96lgcm6brgv063jvlxq12f4z89y2yw4y0v99z3fy2wgn2ps8y"; + version = "0.3.0"; + sha256 = "1imi7csng0q6qmwz2ii4j33nwcmiyzi072nvgh36a3lgi0ja6q9x"; libraryHaskellDepends = [ base bytestring exceptions pcre-utils regex-pcre-builtin text ]; @@ -64237,16 +64517,17 @@ self: { }) {}; "crdt-event-fold" = callPackage - ({ mkDerivation, base, binary, containers, data-default-class - , data-dword, hspec, mtl, transformers + ({ mkDerivation, aeson, base, binary, containers + , data-default-class, data-dword, hspec, monad-logger, mtl + , transformers }: mkDerivation { pname = "crdt-event-fold"; - version = "1.2.1.1"; - sha256 = "0qwc72j2v3kdvh3iq6vn0anwicpqpx59in6q9yvc5jbk4f24zpl2"; + version = "1.3.0.0"; + sha256 = "0zpbn7rx9zywrfhpaj7lji0is0sb61al7q8fddrxy8vvirvhbb85"; libraryHaskellDepends = [ - base binary containers data-default-class data-dword mtl - transformers + aeson base binary containers data-default-class data-dword + monad-logger mtl transformers ]; testHaskellDepends = [ base hspec ]; description = "Garbage collected event folding CRDT"; @@ -65376,8 +65657,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Fast, pure and practical SHA-512 implementation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cryptoids" = callPackage @@ -65569,6 +65848,8 @@ self: { pname = "cryptsy-api"; version = "0.2.1"; sha256 = "1knnzh77y4rr7ka2nfwr99z61v2pvx2p1mzji06ac0mjk2n80ybs"; + revision = "1"; + editedCabalFile = "0j7ak0dypmr8g9zxrkr9pv5rn2hkj0m2lny2r1j2gwzkw61xifiz"; libraryHaskellDepends = [ aeson base bytestring deepseq either http-client http-client-tls old-locale pipes-attoparsec pipes-http text time transformers @@ -67156,8 +67437,8 @@ self: { ]; doCheck = false; postInstall = '' - mkdir -p $out/etc/bash_completion.d - mv contrib/darcs_completion $out/etc/bash_completion.d/darcs + mkdir -p $out/share/bash-completion/completions + mv contrib/darcs_completion $out/share/bash-completion/completions/darcs ''; description = "a distributed, interactive, smart revision control system"; license = stdenv.lib.licenses.gpl2Plus; @@ -69283,13 +69564,12 @@ self: { }: mkDerivation { pname = "data-validation"; - version = "0.1.2.0"; - sha256 = "1qka2f0gl48yi2hfiqphk94srh5lq7i14vx0qmj09fgv8xn65n15"; - libraryHaskellDepends = [ - base containers regex-tdfa template-haskell + version = "0.1.2.4"; + sha256 = "1ck7grirqv0hbi973fgbgwzflsmz8diwi1rmjmfxz1f3915vi1yz"; + libraryHaskellDepends = [ base containers template-haskell ]; + testHaskellDepends = [ + base containers hspec regex-tdfa template-haskell ]; - testHaskellDepends = [ base containers hspec template-haskell ]; - doHaddock = false; description = "A library for creating type safe validations"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -69309,6 +69589,22 @@ self: { broken = true; }) {}; + "data-vector-growable" = callPackage + ({ mkDerivation, async, atomic-primops, base, exceptions, primitive + , vector + }: + mkDerivation { + pname = "data-vector-growable"; + version = "0.0.1"; + sha256 = "0mix8k8b4ry9szfigw8jm0x2cxw1xykknccp3zqrznslrp5wn7n6"; + libraryHaskellDepends = [ + atomic-primops base exceptions primitive vector + ]; + testHaskellDepends = [ async base vector ]; + description = "Dynamic growable resizable mutable generic vector"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "database-id-class" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { @@ -71958,8 +72254,8 @@ self: { }: mkDerivation { pname = "derive-storable-plugin"; - version = "0.2.3.1"; - sha256 = "1g2i2l97jldw9yv10dbcbaq54lz1k1aajhxr28m7fgjwf2mry3gi"; + version = "0.2.3.3"; + sha256 = "1p15iia1zg9hm462wbhbcrk70zaphpsbkdbksfxizyfcw9c0v9qf"; libraryHaskellDepends = [ base derive-storable ghc ghci ]; testHaskellDepends = [ base derive-storable ghc ghci hspec QuickCheck @@ -72579,10 +72875,62 @@ self: { }: mkDerivation { pname = "dhall"; - version = "1.36.0"; - sha256 = "014bdxmrcxzc2yrk838fxbz521714fk3a7c6idb9065wrfzch1wj"; - revision = "1"; - editedCabalFile = "1561i0rv0qx4mizwg1k04qynwdz6gsx4fifps9415rwdfki6dyxw"; + version = "1.37.0"; + sha256 = "126092s8m5kf1bmihwg73kfjcll9y0icqj4aa48m9hg7qm92nq0x"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal atomic-write base bytestring + case-insensitive cborg cborg-json containers contravariant + cryptonite data-fix deepseq Diff directory dotgen either exceptions + filepath half hashable haskeline http-client http-client-tls + http-types lens-family-core megaparsec memory mmorph mtl + network-uri optparse-applicative parser-combinators parsers + pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors + repline scientific serialise template-haskell text text-manipulate + th-lift-instances transformers transformers-compat + unordered-containers uri-encode vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring cborg containers data-fix deepseq directory doctest + either filepath foldl generic-random http-client http-client-tls + lens-family-core megaparsec mockery prettyprinter QuickCheck + quickcheck-instances scientific serialise special-values spoon + tasty tasty-expected-failure tasty-hunit tasty-quickcheck + tasty-silver template-haskell text transformers turtle + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers directory gauge text + ]; + doCheck = false; + description = "A configuration language guaranteed to terminate"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "dhall_1_37_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write + , base, bytestring, case-insensitive, cborg, cborg-json, containers + , contravariant, cryptonite, data-fix, deepseq, Diff, directory + , doctest, dotgen, either, exceptions, filepath, foldl, gauge + , generic-random, half, hashable, haskeline, http-client + , http-client-tls, http-types, lens-family-core, megaparsec, memory + , mmorph, mockery, mtl, network-uri, optparse-applicative + , parser-combinators, parsers, pretty-simple, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck + , quickcheck-instances, repline, scientific, serialise + , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, tasty-silver, template-haskell, text + , text-manipulate, th-lift-instances, transformers + , transformers-compat, turtle, unordered-containers, uri-encode + , vector + }: + mkDerivation { + pname = "dhall"; + version = "1.37.1"; + sha256 = "16qpasw41wcgbi9ljrs43dn2ajw25yipm8kxri6v5fwj3gyzj24d"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -72614,6 +72962,7 @@ self: { doCheck = false; description = "A configuration language guaranteed to terminate"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dhall-bash" = callPackage @@ -72622,8 +72971,8 @@ self: { }: mkDerivation { pname = "dhall-bash"; - version = "1.0.34"; - sha256 = "1p1zylrjk80lh8rxpw2z3wyvk9x7q65lwyfwfacx8rrbgzx54riy"; + version = "1.0.35"; + sha256 = "0v7br83m3zhz4pa98yrzbikkvldgrprjq0z5amimjsk8lcdmpq8k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72665,8 +73014,8 @@ self: { }: mkDerivation { pname = "dhall-docs"; - version = "1.0.2"; - sha256 = "17l8vwj02lbkqy8p4j7rhmwidrxx1ln375cv8lgwwx4n0fgvmgfc"; + version = "1.0.3"; + sha256 = "0cinkgcihn15zws18nff42lcpmzv4cg7k8wxmcwa93k7qvw01i2p"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -72728,8 +73077,8 @@ self: { }: mkDerivation { pname = "dhall-json"; - version = "1.7.3"; - sha256 = "0as1n4qy0rynmj1y7h39l1lazqarwgizbzsn0g7apixzzdfm53kx"; + version = "1.7.4"; + sha256 = "1qzlv7wvap1ivgv7fi9ikqa9nm9z9kbbca5zvddh3njcdk6i73n9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72777,8 +73126,8 @@ self: { }: mkDerivation { pname = "dhall-lsp-server"; - version = "1.0.11"; - sha256 = "0xp4mbk26p22xs5f2bz493yi9ijbiiz1jwmc462yk1bxxz5lbx5n"; + version = "1.0.12"; + sha256 = "0gp9pa3pdm49ya6awdi1qjbycxdihz2z11mzmfnr5m2gf0vrjzpp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72802,8 +73151,8 @@ self: { }: mkDerivation { pname = "dhall-nix"; - version = "1.1.18"; - sha256 = "0d947iz98mkmz7chxcp2402kid711na7xwwx8xzh8jg5lh41sm7w"; + version = "1.1.19"; + sha256 = "0w3vxqn1h39f17mg246ydxni02civ3fm85s0wi4ks6iy1ng4dw0a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72827,8 +73176,8 @@ self: { }: mkDerivation { pname = "dhall-nixpkgs"; - version = "1.0.2"; - sha256 = "1r76zbqk2pc5pryrbdj425j6bb86x28pqfkav3kw9kr4703afhni"; + version = "1.0.3"; + sha256 = "03apykbil3x3j7ndapfgmf39p7l62d1lrn2ad1m6k5xqnd8nqlxf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -72899,8 +73248,8 @@ self: { }: mkDerivation { pname = "dhall-yaml"; - version = "1.2.3"; - sha256 = "1n42brr1yifb4pyl26960rsm8b1wzw0hvv6mmq8m5ml5av61ymf3"; + version = "1.2.4"; + sha256 = "0xm1dsim5x83k6kp5g9yv08ixf6l4p2mm666m4vsylx98y5nwmag"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74560,8 +74909,8 @@ self: { }: mkDerivation { pname = "diohsc"; - version = "0.1.2"; - sha256 = "0ksawn7wspw1f3yaaqyz4sgbl0p9fnidn1jjfwmjs9zrna1cb084"; + version = "0.1.3.1"; + sha256 = "1k44bi5ri63qsps0vh24qc32bclp3nqp2qbs6ylxm9k0q76758iw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -74800,6 +75149,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "directory-contents" = callPackage + ({ mkDerivation, base, containers, directory, filepath, text + , transformers, witherable + }: + mkDerivation { + pname = "directory-contents"; + version = "0.2.0.0"; + sha256 = "15irmkg3ll6s3dqwl4hn7mmr5kygcl11slba3mzkdhlyg567is6x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath text transformers witherable + ]; + executableHaskellDepends = [ base filepath text ]; + testHaskellDepends = [ base filepath ]; + description = "Recursively build, navigate, and operate on a tree of directory contents"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "directory-layout" = callPackage ({ mkDerivation, base, bytestring, command-qq, containers , directory, doctest, filepath, free, hspec, lens, semigroups @@ -74901,6 +75269,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dirichlet_0_1_0_2" = callPackage + ({ mkDerivation, base, hspec, log-domain, math-functions + , mwc-random, primitive, vector + }: + mkDerivation { + pname = "dirichlet"; + version = "0.1.0.2"; + sha256 = "1xppfdz3s31md41848awahfipv5g6yhglkw2l5l3q0jc5wsc1vvw"; + libraryHaskellDepends = [ + base log-domain math-functions mwc-random primitive vector + ]; + testHaskellDepends = [ base hspec log-domain mwc-random vector ]; + description = "Multivariate Dirichlet distribution"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dirstream" = callPackage ({ mkDerivation, base, directory, pipes, pipes-safe, system-fileio , system-filepath, unix @@ -77003,6 +77388,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "doctemplates_0_9" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific + , tasty, tasty-golden, tasty-hunit, temporary, text + , text-conversions, unordered-containers, vector + }: + mkDerivation { + pname = "doctemplates"; + version = "0.9"; + sha256 = "048h8ka849h1f0xxwkasjbrrwq03rfz2m7aqg5xc5286kp02w9ns"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base containers doclayout filepath HsYAML mtl parsec safe + scientific text text-conversions unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers doclayout filepath Glob tasty + tasty-golden tasty-hunit temporary text + ]; + benchmarkHaskellDepends = [ + aeson base containers criterion doclayout filepath mtl text + ]; + description = "Pandoc-style document templates"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "doctest" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, hspec-core, HUnit, mockery @@ -80510,8 +80922,8 @@ self: { }: mkDerivation { pname = "effet"; - version = "0.3.0.2"; - sha256 = "1yy8hpq74bp4ffz7b5h7j9ja6akizl7d3b9n7n42c0iwlzr1hi4s"; + version = "0.4.0.0"; + sha256 = "0k3m3dmm5ddvick5qm2cvz3vmzyn2jg4r7sskr13l73dnh5is5f0"; libraryHaskellDepends = [ base containers monad-control template-haskell transformers transformers-base @@ -80862,8 +81274,8 @@ self: { }: mkDerivation { pname = "ejdb2-binding"; - version = "0.3.0.0"; - sha256 = "06zqdnycpzpaymfnimz87v1rc5a8xlnr8mcd49a90ivza967vmmr"; + version = "0.3.0.1"; + sha256 = "0rwqwjdcx3rb8v4riqawbjblmhmi6d2h9gzsyhdaafpm9z9z2ymz"; libraryHaskellDepends = [ aeson base bytestring mtl unordered-containers ]; @@ -81829,6 +82241,24 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "elynx_0_5_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, elynx-tools + , optparse-applicative, slynx, tlynx + }: + mkDerivation { + pname = "elynx"; + version = "0.5.0.1"; + sha256 = "1rglf080hx4c8nai07ghh2wf6j79x9hfx2mjzbqc588y0rpj7kmj"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring elynx-tools optparse-applicative slynx tlynx + ]; + description = "Validate and (optionally) redo ELynx analyses"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elynx-markov" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, containers , elynx-seq, elynx-tools, hmatrix, hspec, integration @@ -81851,6 +82281,29 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "elynx-markov_0_5_0_1" = callPackage + ({ mkDerivation, async, attoparsec, base, bytestring, containers + , elynx-seq, elynx-tools, hmatrix, hspec, integration + , math-functions, mwc-random, parallel, primitive, statistics + , vector + }: + mkDerivation { + pname = "elynx-markov"; + version = "0.5.0.1"; + sha256 = "0m24kzayvhc2mhhk2glpw82kmdbgk38vl2d0xdkkdnnbqag8mbqa"; + libraryHaskellDepends = [ + async attoparsec base bytestring containers elynx-seq hmatrix + integration math-functions mwc-random parallel primitive statistics + vector + ]; + testHaskellDepends = [ + base containers elynx-tools hmatrix hspec mwc-random vector + ]; + description = "Simulate molecular sequences along trees"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elynx-nexus" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { @@ -81863,6 +82316,19 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "elynx-nexus_0_5_0_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, hspec }: + mkDerivation { + pname = "elynx-nexus"; + version = "0.5.0.1"; + sha256 = "0jh5j4f8awallrjbgrgdjl6jdzk2lswr28xjryqdapwf4licfkk2"; + libraryHaskellDepends = [ attoparsec base bytestring ]; + testHaskellDepends = [ base hspec ]; + description = "Import and export Nexus files"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elynx-seq" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , elynx-tools, hspec, matrices, mwc-random, parallel, primitive @@ -81883,6 +82349,27 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "elynx-seq_0_5_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , elynx-tools, hspec, matrices, mwc-random, parallel, primitive + , vector, vector-th-unbox, word8 + }: + mkDerivation { + pname = "elynx-seq"; + version = "0.5.0.1"; + sha256 = "0b5jih0jgcf0rbcbwj18l269wbgf31i9125gx3rz6w7ydapmr7wr"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers matrices mwc-random + parallel primitive vector vector-th-unbox word8 + ]; + testHaskellDepends = [ + base bytestring elynx-tools hspec matrices vector + ]; + description = "Handle molecular sequences"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elynx-tools" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, cryptohash-sha256, deepseq, directory, fast-logger @@ -81905,6 +82392,29 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "elynx-tools_0_5_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, cryptohash-sha256, deepseq, directory, fast-logger + , hmatrix, monad-control, monad-logger, mwc-random + , optparse-applicative, primitive, template-haskell, text, time + , transformers, transformers-base, vector, zlib + }: + mkDerivation { + pname = "elynx-tools"; + version = "0.5.0.1"; + sha256 = "0lq5jv9dwyi0plkx1n270dan8nfxac9q7rhcdq95mzhgar8daink"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring + cryptohash-sha256 deepseq directory fast-logger hmatrix + monad-control monad-logger mwc-random optparse-applicative + primitive template-haskell text time transformers transformers-base + vector zlib + ]; + description = "Tools for ELynx"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elynx-tree" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad , containers, criterion, deepseq, double-conversion, elynx-nexus @@ -81931,6 +82441,32 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "elynx-tree_0_5_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad + , containers, criterion, deepseq, double-conversion, elynx-nexus + , elynx-tools, hspec, math-functions, microlens, mwc-random + , parallel, primitive, QuickCheck, statistics + }: + mkDerivation { + pname = "elynx-tree"; + version = "0.5.0.1"; + sha256 = "1pzam7qg7qihim50iyxw2fsy58xakzjvzskaa4vhzg9cghmjjva8"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring comonad containers deepseq + double-conversion elynx-nexus math-functions mwc-random parallel + primitive statistics + ]; + testHaskellDepends = [ + attoparsec base bytestring containers elynx-tools hspec QuickCheck + ]; + benchmarkHaskellDepends = [ + base criterion elynx-tools microlens mwc-random parallel + ]; + description = "Handle phylogenetic trees"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "emacs-keys" = callPackage ({ mkDerivation, base, doctest, split, tasty, tasty-hspec , tasty-quickcheck, template-haskell, th-lift, xkbcommon @@ -82450,10 +82986,8 @@ self: { }: mkDerivation { pname = "engine-io"; - version = "1.2.22"; - sha256 = "19hmd804r9k20270zlsfbsyvww5syi5h3nl74klvgmni39ahcxcl"; - revision = "1"; - editedCabalFile = "098nkv1zrc4b80137pxdz87by83bla9cbsv6920cpbspkic8x9xz"; + version = "1.2.23"; + sha256 = "0q03njv1fdc0g3i0l5bz43xj734wams5qs790y2vvxnjm3ajnjxb"; libraryHaskellDepends = [ aeson async attoparsec base base64-bytestring bytestring errors free monad-loops mwc-random stm stm-delay text transformers @@ -83590,6 +84124,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "error-or_0_1_2_0" = callPackage + ({ mkDerivation, base, containers, text }: + mkDerivation { + pname = "error-or"; + version = "0.1.2.0"; + sha256 = "0ry06vhz7mrl7i587vw3pv2ralh8aw7km6jfhagww0hmckwdjqmm"; + libraryHaskellDepends = [ base containers text ]; + description = "Composable, hierarchical errors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "error-or-utils" = callPackage ({ mkDerivation, base, containers, error-or, text }: mkDerivation { @@ -84074,8 +84620,6 @@ self: { testHaskellDepends = [ base essence-of-live-coding http-client ]; description = "General purpose live coding framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "estimator" = callPackage @@ -84867,20 +85411,22 @@ self: { "eventlog2html" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, blaze-html - , bytestring, containers, file-embed, filepath, ghc-events - , hashable, hashtables, hvega, mtl, optparse-applicative - , semigroups, text, time, trie-simple, vector + , bytestring, containers, cpu, directory, file-embed, filepath + , ghc-events, ghc-heap, hashable, hashtables, hvega, mtl + , optparse-applicative, semigroups, statistics-linreg, strict, text + , time, trie-simple, vector }: mkDerivation { pname = "eventlog2html"; - version = "0.7.0"; - sha256 = "045ihz620xv6qhic3vy257g59l1ly2sld6dcnq28xblsf461krv1"; + version = "0.8.2"; + sha256 = "01qfggrnfsldv5sp62q14k8d04fm7qx6kwg6z4nipirbpnya8s89"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson array attoparsec base blaze-html bytestring containers - file-embed filepath ghc-events hashable hashtables hvega mtl - optparse-applicative semigroups text time trie-simple vector + aeson array attoparsec base blaze-html bytestring containers cpu + directory file-embed filepath ghc-events ghc-heap hashable + hashtables hvega mtl optparse-applicative semigroups + statistics-linreg strict text time trie-simple vector ]; executableHaskellDepends = [ aeson base filepath text ]; description = "Visualise an eventlog"; @@ -85964,6 +86510,38 @@ self: { broken = true; }) {}; + "experimenter" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, cereal-vector + , conduit, containers, deepseq, directory, esqueleto, filepath + , foundation, HaTeX, hostname, hspec, lens, matrix, monad-logger + , mtl, mwc-random, parallel, persistent, persistent-postgresql + , persistent-template, process, QuickCheck, resource-pool + , resourcet, stm, text, time, transformers, unix, unliftio-core + , vector + }: + mkDerivation { + pname = "experimenter"; + version = "0.1.0.2"; + sha256 = "1qk0ss8z476q4p6agi55yzs72vc01lgl19jqdyjind119vv62840"; + libraryHaskellDepends = [ + aeson base bytestring cereal cereal-vector conduit containers + deepseq directory esqueleto filepath HaTeX hostname lens matrix + monad-logger mtl mwc-random parallel persistent + persistent-postgresql persistent-template process resource-pool + resourcet stm text time transformers unix unliftio-core vector + ]; + testHaskellDepends = [ + aeson base bytestring cereal cereal-vector conduit containers + deepseq directory esqueleto filepath foundation HaTeX hostname + hspec lens matrix monad-logger mtl mwc-random parallel persistent + persistent-postgresql persistent-template process QuickCheck + resource-pool resourcet stm text time transformers unix + unliftio-core vector + ]; + description = "Perform scientific experiments stored in a DB, and generate reports"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "expiring-cache-map" = callPackage ({ mkDerivation, base, bytestring, containers, hashable, time , unordered-containers @@ -86436,33 +87014,35 @@ self: { }) {}; "extensible-effects-concurrent" = callPackage - ({ mkDerivation, async, base, containers, data-default, deepseq - , directory, exceptions, extensible-effects, filepath, hashable - , hostname, HUnit, lens, monad-control, mtl, network, pretty-types + ({ mkDerivation, async, base, containers, criterion, data-default + , deepseq, directory, exceptions, extensible-effects, filepath + , hashable, hostname, HUnit, lens, monad-control, mtl, network , QuickCheck, safe-exceptions, stm, tasty, tasty-discover - , tasty-hunit, text, time, transformers-base + , tasty-hunit, text, time, transformers-base, unliftio }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.32.0"; - sha256 = "1zipam9jac1bj4fkzihgh0hasiwgpycidhvxb0b2b0q7ic18487a"; + version = "2.0.0"; + sha256 = "1yzn3lhrwn4r4v1qxv9ask8qg6i5p4rkak5hlvai3nv3f3jnnz6c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base containers data-default deepseq directory exceptions extensible-effects filepath hashable hostname lens monad-control - mtl network pretty-types safe-exceptions stm text time - transformers-base + mtl network safe-exceptions stm text time transformers-base ]; executableHaskellDepends = [ - base data-default deepseq extensible-effects lens pretty-types text + base data-default deepseq extensible-effects lens text ]; testHaskellDepends = [ async base containers data-default deepseq extensible-effects - filepath hostname HUnit lens monad-control pretty-types QuickCheck - stm tasty tasty-discover tasty-hunit text time + filepath hostname HUnit lens monad-control QuickCheck stm tasty + tasty-discover tasty-hunit text time ]; testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base criterion deepseq extensible-effects text unliftio + ]; description = "Message passing concurrency as extensible-effect"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -86571,6 +87151,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extra_1_7_9" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, quickcheck-instances, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.7.9"; + sha256 = "17fzmxwrv0w7inhq7kia36prc2nsx845r9v56sihqvr17fk2cvpn"; + libraryHaskellDepends = [ + base clock directory filepath process time unix + ]; + testHaskellDepends = [ + base directory filepath QuickCheck quickcheck-instances unix + ]; + description = "Extra functions I use"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -88435,26 +89034,28 @@ self: { }) {}; "fei-base" = callPackage - ({ mkDerivation, base, c2hs, c2hs-extra, constraints, directory - , filepath, haskell-src-exts, hslogger, mtl, mxnet - , optparse-applicative, repa, text, tuple-ops, vector + ({ mkDerivation, attoparsec, base, c2hs, constraints, deepseq + , haskell-src-exts, hslogger, lens, mxnet, optparse-applicative + , repa, rio, store, tuple-ops, vector }: mkDerivation { pname = "fei-base"; - version = "0.2.0.0"; - sha256 = "0blgzr1iy7d2cp370rankkldakkryysikh1rd039s7anq5l21rsg"; + version = "1.0.0"; + sha256 = "0lpf217v6sddg7w4lsqnpmyqih3sjsyqmdskxdds39dhylvhax71"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base c2hs-extra constraints repa tuple-ops vector + attoparsec base constraints deepseq lens repa rio store tuple-ops + vector ]; librarySystemDepends = [ mxnet ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ - base directory filepath haskell-src-exts hslogger mtl - optparse-applicative text + base deepseq haskell-src-exts hslogger lens optparse-applicative + rio tuple-ops ]; executableSystemDepends = [ mxnet ]; + executableToolDepends = [ c2hs ]; description = "FFI to MXNet"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -88462,28 +89063,27 @@ self: { }) {inherit (pkgs) mxnet;}; "fei-cocoapi" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, c2hs, conduit - , containers, criterion, directory, exceptions, fei-base - , fei-dataiter, filepath, JuicyPixels, JuicyPixels-extra - , JuicyPixels-repa, lens, mtl, random-fu, repa, storable-tuple - , store, time, transformers-base, vector + ({ mkDerivation, aeson, attoparsec, base, c2hs, colour, conduit + , conduit-concurrent-map, FontyFruity, formatting, hip, JuicyPixels + , lens, optparse-applicative, palette, random-fu, Rasterific, repa + , resourcet, rio, storable-tuple, store, time, transformers-base + , unliftio-core, vector }: mkDerivation { pname = "fei-cocoapi"; - version = "0.2.0"; - sha256 = "0sk3h94vlykq6x4nk25scb7jwhgi9rlk66xhy09wbz1a1n398j5z"; + version = "1.0.0"; + sha256 = "1zn9dz0k3py0k85nhbp3hj3nzyggygxpqa5wcf1b7jgm0hagw8kc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - exceptions fei-base fei-dataiter filepath JuicyPixels - JuicyPixels-extra JuicyPixels-repa lens mtl random-fu repa - storable-tuple store time transformers-base vector + aeson attoparsec base conduit conduit-concurrent-map hip lens + random-fu repa resourcet rio storable-tuple store time + transformers-base unliftio-core vector ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ - aeson base bytestring containers criterion JuicyPixels - JuicyPixels-repa lens repa store vector + aeson base colour FontyFruity formatting hip JuicyPixels lens + optparse-applicative palette Rasterific repa rio store ]; description = "Cocodataset with cocoapi"; license = stdenv.lib.licenses.bsd3; @@ -88519,22 +89119,52 @@ self: { broken = true; }) {inherit (pkgs) mxnet;}; + "fei-datasets" = callPackage + ({ mkDerivation, aeson, attoparsec, base, conduit + , conduit-concurrent-map, criterion, fei-base, fei-cocoapi, fei-nn + , FontyFruity, hexpat, hip, JuicyPixels, JuicyPixels-extra + , JuicyPixels-repa, lens, optparse-applicative, random-fu + , random-source, Rasterific, repa, resourcet, rio, stm-conduit + , storable-tuple, store, transformers-base, vector + }: + mkDerivation { + pname = "fei-datasets"; + version = "1.0.0"; + sha256 = "177ny2z5psj4f61v4k7ijaxbawxs6ba18ax05f8fllfiyyx440wf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base conduit conduit-concurrent-map fei-base + fei-cocoapi fei-nn hexpat hip lens random-fu random-source repa + resourcet rio storable-tuple store transformers-base vector + ]; + executableHaskellDepends = [ + attoparsec base conduit criterion fei-base fei-nn FontyFruity hip + JuicyPixels JuicyPixels-extra JuicyPixels-repa lens + optparse-applicative random-source Rasterific repa resourcet rio + stm-conduit vector + ]; + description = "Some datasets"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "fei-examples" = callPackage - ({ mkDerivation, attoparsec, base, conduit, directory, fei-base - , fei-cocoapi, fei-dataiter, fei-nn, lens, mtl - , optparse-applicative, random-fu, repa, text, unordered-containers - , vector + ({ mkDerivation, attoparsec, base, conduit, fei-base, fei-cocoapi + , fei-datasets, fei-modelzoo, fei-nn, formatting, JuicyPixels, lens + , optparse-applicative, random-source, repa, resourcet, rio, store }: mkDerivation { pname = "fei-examples"; - version = "0.3.0"; - sha256 = "1yplcfls0c22h1808ky64ifdxswq60dq5l0qw0kmg452517xb2yx"; + version = "1.0.0"; + sha256 = "0jgv67rx8vdqri4zsl8z0y62g1xh02l4rq29v1h6jj2xpw9b87a6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - attoparsec base conduit directory fei-base fei-cocoapi fei-dataiter - fei-nn lens mtl optparse-applicative random-fu repa text - unordered-containers vector + attoparsec base conduit fei-base fei-cocoapi fei-datasets + fei-modelzoo fei-nn formatting JuicyPixels lens + optparse-applicative random-source repa resourcet rio store ]; description = "fei examples"; license = stdenv.lib.licenses.bsd3; @@ -88542,26 +89172,40 @@ self: { broken = true; }) {}; + "fei-modelzoo" = callPackage + ({ mkDerivation, attoparsec, base, fei-base, fei-nn, formatting + , lens, random-fu, repa, rio, text, transformers-base, vector + }: + mkDerivation { + pname = "fei-modelzoo"; + version = "1.0.0"; + sha256 = "0ly8lc7dpjs6i5idyi16ghkva1nhm6d1lp2zgyl3mwsapz2mn1ga"; + libraryHaskellDepends = [ + attoparsec base fei-base fei-nn formatting lens random-fu repa rio + text transformers-base vector + ]; + description = "A collection of standard models"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "fei-nn" = callPackage - ({ mkDerivation, aeson, attoparsec, attoparsec-binary, base - , bytestring, containers, exceptions, fei-base, ghc-prim, graphviz - , lens, mmorph, mtl, resourcet, template-haskell, text, time - , transformers-base, unordered-containers, vector + ({ mkDerivation, aeson, base, conduit, conduit-combinators + , containers, fei-base, FontyFruity, formatting, graphviz + , JuicyPixels, lens, Rasterific, repa, resourcet, rio, stm-conduit + , streaming, template-haskell, time, transformers-base + , type-combinators, uuid, wl-pprint-text }: mkDerivation { pname = "fei-nn"; - version = "0.2.0"; - sha256 = "08zdp0h87cddrwb7wrbk341k7v8hhriqp1jhgf6nmkjgqlwspk0m"; - isLibrary = true; - isExecutable = true; + version = "1.0.0"; + sha256 = "03j9j270qcbdylkxh6z7jkyzdm3mjh8p33a63igqcgvcm5r27ipl"; libraryHaskellDepends = [ - aeson base bytestring containers exceptions fei-base graphviz lens - mtl resourcet template-haskell text time transformers-base - unordered-containers vector - ]; - executableHaskellDepends = [ - attoparsec attoparsec-binary base bytestring exceptions fei-base - ghc-prim mmorph mtl resourcet unordered-containers vector + aeson base conduit conduit-combinators containers fei-base + FontyFruity formatting graphviz JuicyPixels lens Rasterific repa + resourcet rio stm-conduit streaming template-haskell time + transformers-base type-combinators uuid wl-pprint-text ]; description = "Train a neural network with MXNet in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -90809,8 +91453,6 @@ self: { ]; description = "Principled and efficient bit-oriented binary serialization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "flat-maybe" = callPackage @@ -91872,8 +92514,8 @@ self: { }: mkDerivation { pname = "focus"; - version = "1.0.1.4"; - sha256 = "1knaiwnxcl2hrx4b3k954rd5v995gxa48db1z9mp58s646ymlmfl"; + version = "1.0.2"; + sha256 = "09d85g6knv3wcn8ib5mpbpjn9xw1pbl3a6qlfy1lrzypv9lrv0ld"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -93372,6 +94014,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "free_5_1_5" = callPackage + ({ mkDerivation, base, comonad, containers, distributive + , exceptions, indexed-traversable, mtl, profunctors, semigroupoids + , template-haskell, th-abstraction, transformers, transformers-base + }: + mkDerivation { + pname = "free"; + version = "5.1.5"; + sha256 = "0rpnimi3iyr6n9q2ny365mp1l5rjjys15aggcikgnrfn0d656nw6"; + libraryHaskellDepends = [ + base comonad containers distributive exceptions indexed-traversable + mtl profunctors semigroupoids template-haskell th-abstraction + transformers transformers-base + ]; + description = "Monads for free"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "free-algebras" = callPackage ({ mkDerivation, base, containers, data-fix, dlist, free, groups , hedgehog, kan-extensions, mtl, transformers @@ -95375,8 +96036,8 @@ self: { }: mkDerivation { pname = "fused-effects"; - version = "1.1.0.0"; - sha256 = "0ns1h03skgywfm3i5748q9hxvla5769p7hb72zw8yhdfpgwh9rlx"; + version = "1.1.1.0"; + sha256 = "0z83iw3bysfk13pda44lasgyg3nlnrxv6bz1f9mpdyymq3vnb9d7"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base containers hedgehog hedgehog-fn inspection-testing tasty @@ -95584,8 +96245,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.18.3"; - sha256 = "15x528wskfl158909y0qapq72084kq4rjbpp2yd96gh2ycgawz7b"; + version = "0.18.4"; + sha256 = "1qpl16r6q0bhb99502nv5skmycr825rjgnpna1y0flpdhkprmmqr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98766,7 +99427,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc_8_10_1" = callPackage + "ghc_8_10_2" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap , ghci, hpc, process, template-haskell, terminfo, time @@ -98774,8 +99435,8 @@ self: { }: mkDerivation { pname = "ghc"; - version = "8.10.1"; - sha256 = "0j5cmb0bqndmrgr92zysa6yiccammdr2pgm9swwkipm5jz4g6d5s"; + version = "8.10.2"; + sha256 = "0xh6ll9x8iv74cv5l6q9q3qwm0qw0qkfxzh7dj3b6yzh10b63g8z"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath ghc-boot ghc-boot-th ghc-heap ghci hpc process template-haskell @@ -98816,12 +99477,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot-th_8_10_1" = callPackage + "ghc-boot-th_8_10_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "8.10.1"; - sha256 = "0vhhmsd32p7zn9vhpv4d0k0b55n2dyhzy42xblndrma617kz8gli"; + version = "8.10.2"; + sha256 = "1jic3l319b02f8b4r87c48645xhn5784vhgz2mp7d0zi2srrsfcz"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the `template-haskell` library"; license = stdenv.lib.licenses.bsd3; @@ -99064,6 +99725,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-events_0_15_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers, text + , vector + }: + mkDerivation { + pname = "ghc-events"; + version = "0.15.0"; + sha256 = "058ha55661qcxwd5zgmh6vwkdaj7l50h7xri9l1zg26gx69w3bhw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers text vector + ]; + executableHaskellDepends = [ base containers ]; + testHaskellDepends = [ base ]; + description = "Library and tool for parsing .eventlog files from GHC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-events-analyze" = callPackage ({ mkDerivation, base, blaze-svg, bytestring, containers , diagrams-lib, diagrams-svg, filepath, ghc-events, hashable, lens @@ -99288,6 +99969,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-lib_8_10_3_20201220" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy + , hpc, pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib"; + version = "8.10.3.20201220"; + sha256 = "04df1j997m48vjxkfcp07d9vsxgpqi315zvfri1y1qxdg5g4vlmb"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + ghc-lib-parser ghc-prim hpc pretty process time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-lib-parser" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty @@ -99307,6 +100008,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-lib-parser_8_10_3_20201220" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty + , process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "8.10.3.20201220"; + sha256 = "0k68w2v5x68sxqcd7xm94khmr4gqxbj4jdsaac3m1wcy66bjriir"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + ghc-prim hpc pretty process time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-lib-parser-ex" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit @@ -99327,6 +100048,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-lib-parser-ex_8_10_0_17" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, extra + , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit + , uniplate + }: + mkDerivation { + pname = "ghc-lib-parser-ex"; + version = "8.10.0.17"; + sha256 = "16qbyvczncdb25g7mjdvxsn7m3j98649jy1pnv90vmyrn8l4m897"; + libraryHaskellDepends = [ + base bytestring containers ghc ghc-boot ghc-boot-th uniplate + ]; + testHaskellDepends = [ + base directory extra filepath ghc ghc-boot ghc-boot-th tasty + tasty-hunit uniplate + ]; + description = "Algorithms on GHC parse trees"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-make" = callPackage ({ mkDerivation, base, process, shake, unordered-containers }: mkDerivation { @@ -100007,15 +100749,15 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "ghci_8_10_1" = callPackage + "ghci_8_10_2" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap , template-haskell, transformers, unix }: mkDerivation { pname = "ghci"; - version = "8.10.1"; - sha256 = "14r7h3nj61mhap15r3cq6824b6fib9krj6b6qa77bl7jqdqpfxsq"; + version = "8.10.2"; + sha256 = "1pn6d400mlxgfsskzmcgjxkka9wrma95v0vpgc44gaha5cdsrhh7"; libraryHaskellDepends = [ array base binary bytestring containers deepseq filepath ghc-boot ghc-boot-th ghc-heap template-haskell transformers unix @@ -100204,24 +100946,24 @@ self: { "ghcide" = callPackage ({ mkDerivation, aeson, array, async, base, base16-bytestring - , binary, bytestring, Chart, Chart-diagrams, containers - , cryptohash-sha1, data-default, deepseq, diagrams, diagrams-svg - , directory, extra, filepath, fingertree, fuzzy, ghc, ghc-boot - , ghc-boot-th, ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev - , Glob, haddock-library, hashable, haskell-lsp, haskell-lsp-types - , hie-bios, hie-compat, hslogger, implicit-hie-cradle, lens - , lsp-test, mtl, network-uri, optparse-applicative, prettyprinter + , binary, bytestring, containers, cryptohash-sha1, data-default + , deepseq, directory, extra, filepath, fingertree, fuzzy, ghc + , ghc-boot, ghc-boot-th, ghc-check, ghc-paths + , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable + , haskell-lsp, haskell-lsp-types, heapsize, hie-bios, hie-compat + , hslogger, implicit-hie-cradle, lens, lsp-test, mtl, network-uri + , opentelemetry, optparse-applicative, parallel, prettyprinter , prettyprinter-ansi-terminal, process, QuickCheck , quickcheck-instances, record-dot-preprocessor, record-hasfield , regex-tdfa, rope-utf16-splay, safe, safe-exceptions, shake - , sorted-list, stm, syb, tasty, tasty-expected-failure, tasty-hunit - , tasty-quickcheck, tasty-rerun, text, time, transformers, unix - , unordered-containers, utf8-string, yaml + , shake-bench, sorted-list, stm, syb, tasty, tasty-expected-failure + , tasty-hunit, tasty-quickcheck, tasty-rerun, text, time + , transformers, unix, unordered-containers, utf8-string, yaml }: mkDerivation { pname = "ghcide"; - version = "0.5.0"; - sha256 = "1l3h12jksxh1ds68zkslwmssfsdspxvyp0gqr5n8hgkymr4p896a"; + version = "0.6.0.1"; + sha256 = "06025p7ggqvirdhm4z9pydcc4av0bk2jkqlmdwlabf4f973vcsgq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100229,17 +100971,17 @@ self: { containers cryptohash-sha1 data-default deepseq directory extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-paths Glob haddock-library hashable haskell-lsp - haskell-lsp-types hie-bios hie-compat hslogger implicit-hie-cradle - mtl network-uri prettyprinter prettyprinter-ansi-terminal - regex-tdfa rope-utf16-splay safe safe-exceptions shake sorted-list - stm syb text time transformers unix unordered-containers - utf8-string + haskell-lsp-types heapsize hie-bios hie-compat hslogger + implicit-hie-cradle mtl network-uri opentelemetry parallel + prettyprinter prettyprinter-ansi-terminal regex-tdfa + rope-utf16-splay safe safe-exceptions shake sorted-list stm syb + text time transformers unix unordered-containers utf8-string ]; executableHaskellDepends = [ aeson base bytestring containers data-default directory extra - filepath gitrev hashable haskell-lsp haskell-lsp-types hie-bios - lens lsp-test optparse-applicative process safe-exceptions shake - text unordered-containers + filepath gitrev hashable haskell-lsp haskell-lsp-types heapsize + hie-bios lens lsp-test optparse-applicative process safe-exceptions + shake text unordered-containers ]; testHaskellDepends = [ aeson base binary bytestring containers directory extra filepath @@ -100251,13 +100993,14 @@ self: { text ]; benchmarkHaskellDepends = [ - aeson base Chart Chart-diagrams diagrams diagrams-svg directory - extra filepath shake text yaml + aeson base directory filepath shake shake-bench text yaml ]; description = "The core of an IDE"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ maralorn ]; - }) {}; + broken = true; + }) {shake-bench = null;}; "ghcjs-ajax" = callPackage ({ mkDerivation, aeson, base, http-types, text }: @@ -102837,8 +103580,6 @@ self: { ]; description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gitlab-api" = callPackage @@ -102878,6 +103619,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gitlab-haskell_0_2_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, http-conduit + , http-types, tasty, tasty-hunit, temporary, text, time + , transformers, unix, unliftio, unliftio-core + }: + mkDerivation { + pname = "gitlab-haskell"; + version = "0.2.4"; + sha256 = "1p2sgxnr5xgh0wz3q5vf6xqy827nrplfbcpfwa6kgqxiqgsfsdv2"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring connection http-conduit http-types temporary + text time transformers unix unliftio unliftio-core + ]; + testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; + description = "A Haskell library for the GitLab web API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gitlib" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, conduit , conduit-combinators, containers, directory, exceptions, filepath @@ -103770,8 +104531,8 @@ self: { }: mkDerivation { pname = "gloss-export"; - version = "0.1.0.2"; - sha256 = "0i2x1bbygacrgvi9rvmpq0ddi24vh8dza6hisvif708a8yh6plpr"; + version = "0.1.0.3"; + sha256 = "1m1fxv516kfqx4y684xcd1x0vvzirgv1acawiam5nm26hqvxcf85"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108453,8 +109214,8 @@ self: { }: mkDerivation { pname = "graphula"; - version = "2.0.0.1"; - sha256 = "1sd89mkbqflyzvsszmiddcssnkjn27dgh5dpp082xqla4b7grhml"; + version = "2.0.0.2"; + sha256 = "1fqrjfr9pl9619fhrkl3khpb2lg3svzp644hvzn0bpcnxqj5p41z"; libraryHaskellDepends = [ base containers directory generics-eot HUnit mtl persistent QuickCheck random semigroups temporary text transformers unliftio @@ -108463,8 +109224,8 @@ self: { testHaskellDepends = [ aeson base bytestring containers hspec http-api-data markdown-unlit monad-logger path-pieces persistent persistent-sqlite - persistent-template QuickCheck resourcet semigroups text - transformers unliftio-core uuid + persistent-template QuickCheck resourcet text transformers + unliftio-core uuid ]; testToolDepends = [ markdown-unlit ]; description = "A declarative library for describing dependencies between data"; @@ -108678,8 +109439,8 @@ self: { }: mkDerivation { pname = "greenclip"; - version = "3.3.0"; - sha256 = "02w84wmkih9j9iil9ilwb77qkbvfa6nhllavrcj6rgb7zp264w84"; + version = "3.4.0"; + sha256 = "0763nnh7k4blkamlswnapwxyqfn1l0g6ibpz7k1w2w2asj7a3q98"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -108689,8 +109450,6 @@ self: { executablePkgconfigDepends = [ libXau xcb xdmcp xlibsWrapper ]; description = "Simple clipboard manager to be integrated with rofi"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; inherit (pkgs) xlibsWrapper;}; @@ -109220,6 +109979,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "group-theory" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest + , groups + }: + mkDerivation { + pname = "group-theory"; + version = "0.2.0.0"; + sha256 = "0giwyvki83ndxn9vyfzi5fkz23c95zv5x09ya1in4i8318f8d7az"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base containers groups ]; + testHaskellDepends = [ base doctest ]; + description = "The theory of groups"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "group-with" = callPackage ({ mkDerivation, base, Cabal, containers, hspec, hspec-expectations , QuickCheck @@ -109299,8 +110073,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "groups"; - version = "0.5"; - sha256 = "1ivz03k5bk6d72bibn8jyq4wkivkyakbmvbrp270b33282a4lkpc"; + version = "0.5.2"; + sha256 = "0ghabk9r3pqccwfshy80p460awv0niyfi3nirg5bqnxm923c4njn"; libraryHaskellDepends = [ base ]; description = "Groups"; license = stdenv.lib.licenses.bsd3; @@ -109319,6 +110093,25 @@ self: { broken = true; }) {}; + "grow-vector" = callPackage + ({ mkDerivation, base, primitive, quickcheck-instances, tasty + , tasty-discover, tasty-hspec, tasty-quickcheck, vector + }: + mkDerivation { + pname = "grow-vector"; + version = "0.1.3.0"; + sha256 = "13b75yghy6nksga98wn8gc9b2198g4pqrm52hrldryyf4v83zadg"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base primitive vector ]; + testHaskellDepends = [ + base primitive quickcheck-instances tasty tasty-discover + tasty-hspec tasty-quickcheck + ]; + testToolDepends = [ tasty-discover ]; + description = "Mutable vector with efficient appends"; + license = stdenv.lib.licenses.mit; + }) {}; + "growler" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, either, http-types, lens, monad-control, mtl @@ -111820,31 +112613,33 @@ self: { , cryptohash-sha256, deepseq, directory, doctest, ed25519 , extensible-exceptions, filepath, ghc-prim, hashable, hspec , hspec-discover, HTTP, lukko, mtl, network, network-uri - , old-locale, parsec, pretty, process, QuickCheck, random, split - , stm, tar, template-haskell, text, time, transformers, unix, xml - , zlib + , old-locale, parallel, parsec, pretty, process, QuickCheck, random + , split, stm, tar, template-haskell, text, time, transformers, unix + , xml, zlib }: mkDerivation { pname = "hackport"; - version = "0.6.6"; - sha256 = "0cdwcrk8cqfbfi2kg074zmiq3j5fv3790inwc4hxwhrhv34hz437"; + version = "0.6.7"; + sha256 = "1n7njjw7mc7c460zy3gfdk5x5xbmvna5f6ivc3qakabsh7n1l5d1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array async base base16-bytestring base64-bytestring binary bytestring containers cryptohash-sha256 deepseq directory ed25519 extensible-exceptions filepath ghc-prim hashable HTTP lukko mtl - network network-uri old-locale parsec pretty process random split - stm tar template-haskell text time transformers unix xml zlib + network network-uri old-locale parallel parsec pretty process + random split stm tar template-haskell text time transformers unix + xml zlib ]; testHaskellDepends = [ array base binary bytestring containers deepseq directory doctest - extensible-exceptions filepath hspec mtl parsec pretty process - QuickCheck split template-haskell text time transformers unix xml + extensible-exceptions filepath hspec mtl network-uri parsec pretty + process QuickCheck split template-haskell text time transformers + unix xml ]; testToolDepends = [ hspec-discover ]; description = "Hackage and Portage integration tool"; - license = stdenv.lib.licenses.gpl3; + license = "GPL"; }) {}; "hactor" = callPackage @@ -112817,6 +113612,8 @@ self: { pname = "hakyll-convert"; version = "0.3.0.3"; sha256 = "0i5g4xs0az8znisl8vm60r3m2y3s9dhh8cdb0bl8c5ikqcrlscjf"; + revision = "1"; + editedCabalFile = "1qp2lr6pq6xiw5g7srr2bkg4nj7zrywgrdhly2alk91ix0vxqrmp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112926,8 +113723,8 @@ self: { }: mkDerivation { pname = "hakyll-images"; - version = "1.0.0"; - sha256 = "0433jha6rnw4c80igx6hka9a943b9qimscyda93mgn7v7pakw6l2"; + version = "1.0.1"; + sha256 = "1fbwg37899m82y0gskk9wsif8bc9c3j4iznyqj7v54m5y0hxlhc0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring hakyll JuicyPixels JuicyPixels-extra @@ -115038,8 +115835,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.1.4"; - sha256 = "1zamnp80sncy6fw8j1nsnzcima2f99n1jpcs2vrqyfg1z6n04qhc"; + version = "0.0.1.5"; + sha256 = "0cd686g2v0fvyfhvvsjh0fdz8m5wks7bqncfn008vnccykdq3dfx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115297,8 +116094,8 @@ self: { pname = "hashable"; version = "1.3.0.0"; sha256 = "1d4sn4xjf0swrfg8pl93ipavbj12ch3a9aykhkl6mjnczc9m8bl2"; - revision = "1"; - editedCabalFile = "1c8z7vxlh4whpm1ag4xp6wknnaal28cl4dqdan9rw1c1g10g2w2c"; + revision = "2"; + editedCabalFile = "16va8hx4ynw0n5s2warhs13ilj7hrs5fcdn140h1fiix480as36n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118683,8 +119480,8 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.17.5"; - sha256 = "1isfxzn5gz7py469mh9m6jd430w9alp0x8b75rymd3sp2ihwc3mz"; + version = "0.18.0"; + sha256 = "13j8hsyj7x30s6rl8pigvkcwn9ahrwd85y4i8z6728rsjj2ygih3"; libraryHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit containers cryptonite deepseq entropy hashable hspec memory mtl @@ -118821,8 +119618,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.38.4"; - sha256 = "1kiqib85rblq9y8mz5fsiqv4w9i5bzqj6h62yxd7riigc82h10g3"; + version = "0.39.0"; + sha256 = "1a1bhsjxb1nj49b5xjv78h89xsc5ffrf9qq1n12ak54ckvw0rgmv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121326,6 +122123,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hcount" = callPackage + ({ mkDerivation, attoparsec, base, containers, ghc, lens, numhask + , optparse-applicative, stan, text + }: + mkDerivation { + pname = "hcount"; + version = "0.0.1"; + sha256 = "0lz400p757kcnfkdwr3qrv07hlshv5rlsm3zfrf6zfhg4nayb93p"; + revision = "1"; + editedCabalFile = "0gvwrrhd1hhk242h686chlsww3cmxh5vy7296k5g6p6sb03ir4p5"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + attoparsec base containers ghc lens numhask optparse-applicative + stan text + ]; + description = "Haskell name counts"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hcron" = callPackage ({ mkDerivation, base, bytestring, containers, directory, mtl , old-locale, pretty, process, random, stm, time @@ -121981,8 +122798,8 @@ self: { }: mkDerivation { pname = "heapsize"; - version = "0.3.0"; - sha256 = "14i4yfk8qfpkcajb9h500dx4s5mqnpvfnyh1v3rp8pxcb93ffgc1"; + version = "0.3.0.1"; + sha256 = "0v38czcdnrlpcszbz7janb2qw4bqldhmql0riqq6a9bylv3zfs0y"; libraryHaskellDepends = [ base deepseq exceptions ghc-heap hashable hashtables primitive transformers unordered-containers @@ -122284,6 +123101,8 @@ self: { pname = "hedgehog"; version = "1.0.3"; sha256 = "10lv574491zldqzin433z0vqkq43f0v3shjf78j395y0g1jyky9m"; + revision = "1"; + editedCabalFile = "0v0wgij1sz7smmh7j74g8jdi6gvjdv90f20jci7qskx38mhn5n0j"; libraryHaskellDepends = [ ansi-terminal async base bytestring concurrent-output containers deepseq directory erf exceptions fail lifted-async mmorph @@ -122298,6 +123117,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedgehog_1_0_4" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring + , concurrent-output, containers, deepseq, directory, erf + , exceptions, lifted-async, mmorph, monad-control, mtl, pretty-show + , primitive, random, resourcet, stm, template-haskell, text, time + , transformers, transformers-base, wl-pprint-annotated + }: + mkDerivation { + pname = "hedgehog"; + version = "1.0.4"; + sha256 = "16j60k0xg74861b5a5n9brx1pgwa2yg76v8q8drmhlx46ga5fwdz"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring concurrent-output containers + deepseq directory erf exceptions lifted-async mmorph monad-control + mtl pretty-show primitive random resourcet stm template-haskell + text time transformers transformers-base wl-pprint-annotated + ]; + testHaskellDepends = [ + base containers mmorph mtl pretty-show text transformers + ]; + description = "Release with confidence"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedgehog-checkers" = callPackage ({ mkDerivation, base, containers, either, hedgehog, semigroupoids , semigroups @@ -122463,6 +123307,8 @@ self: { pname = "hedgehog-quickcheck"; version = "0.1.1"; sha256 = "1z2ja63wqz83qhwzh0zs98k502v8fjdpnsnhqk3srypx2nw5vdlp"; + revision = "1"; + editedCabalFile = "0ddmwz3ngamij2k4paf7508dnzqn4qjpgwypbpr8d6s2y95jbvfh"; libraryHaskellDepends = [ base hedgehog QuickCheck transformers ]; description = "Use QuickCheck generators in Hedgehog and vice versa"; license = stdenv.lib.licenses.bsd3; @@ -122662,6 +123508,8 @@ self: { pname = "hedn-functor"; version = "0.1.0.0"; sha256 = "1s90az6akimfq6jwiyicns7v34ryp8riymj0ski1sl4ljjm4r4fi"; + revision = "1"; + editedCabalFile = "08laj7hmykpq83f525agra0qw9xwwpba26fskhm70zhmiz417fqr"; libraryHaskellDepends = [ base containers hedn recursion-schemes text vector ]; @@ -122749,8 +123597,8 @@ self: { pname = "heist"; version = "1.1.0.1"; sha256 = "1j4h9fwny4hl2m5lgsd257lvm9057fb0hmnaqjw8a9k4hyx7hmqq"; - revision = "3"; - editedCabalFile = "0a456cq72fgdy3wvk6db6yqk3mpib85h7kmwrvdjl7p637dvpxzh"; + revision = "4"; + editedCabalFile = "1jwdn5l0iwcrbramfs6h60w0i6hgp2ixii89db8b0xvcbyb8h4hj"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -125144,6 +125992,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hie-bios_0_7_2" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , conduit, conduit-extra, containers, cryptohash-sha1, deepseq + , directory, extra, file-embed, filepath, ghc, hslogger + , hspec-expectations, process, tasty, tasty-expected-failure + , tasty-hunit, temporary, text, time, transformers, unix-compat + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hie-bios"; + version = "0.7.2"; + sha256 = "0cff9kf4qnfkfzvxhxi0hh54x013g5sg0xcw0vpsarc3a91p7da8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring conduit conduit-extra + containers cryptohash-sha1 deepseq directory extra file-embed + filepath ghc hslogger process temporary text time transformers + unix-compat unordered-containers vector yaml + ]; + executableHaskellDepends = [ base directory filepath ghc ]; + testHaskellDepends = [ + base directory extra filepath ghc hspec-expectations tasty + tasty-expected-failure tasty-hunit temporary text + unordered-containers yaml + ]; + description = "Set up a GHC API session"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hie-compat" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, ghc, ghc-boot, transformers @@ -125828,6 +126707,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hinit" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, exceptions + , fused-effects, generic-lens, Glob, haskeline, lens, megaparsec + , mustache, optparse-applicative, parser-combinators, path, path-io + , prettyprinter, prettyprinter-ansi-terminal, process + , quickcheck-text, spdx-license, string-interpolate, text, time + , tomland + }: + mkDerivation { + pname = "hinit"; + version = "0.2.0"; + sha256 = "1iklwj1kzv7nbb4bnrj0idfb0k26jjpw51mkbib73j4jpciah01v"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base Cabal containers directory exceptions fused-effects + generic-lens Glob haskeline lens megaparsec mustache + optparse-applicative parser-combinators path path-io prettyprinter + prettyprinter-ansi-terminal process spdx-license string-interpolate + text time tomland + ]; + executableHaskellDepends = [ base fused-effects path-io ]; + testHaskellDepends = [ + base fused-effects path-io quickcheck-text + ]; + description = "Generic project initialization tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hinotify_0_3_9" = callPackage ({ mkDerivation, async, base, containers, directory, unix }: mkDerivation { @@ -126840,41 +127749,40 @@ self: { ({ mkDerivation, aeson, ansi-terminal, base, base-compat-batteries , bytestring, cmdargs, containers, data-default, Decimal, Diff , directory, extra, filepath, hashable, haskeline, hledger-lib - , lucid, math-functions, megaparsec, mtl, old-time, parsec - , pretty-show, process, regex-tdfa, safe, shakespeare, split - , tabular, tasty, temporary, terminfo, text, time, timeit - , transformers, unordered-containers, utf8-string, utility-ht - , wizards + , lucid, math-functions, megaparsec, mtl, old-time, parsec, process + , regex-tdfa, safe, shakespeare, split, tabular, tasty, temporary + , terminfo, text, time, timeit, transformers, unordered-containers + , utf8-string, utility-ht, wizards }: mkDerivation { pname = "hledger"; - version = "1.19.1"; - sha256 = "0wfsyf2q1kf90mj3lxs0m5ghj153axmpkc8xfy12vkz5imnyphfm"; + version = "1.20.1"; + sha256 = "19f1p5fify3vy1aaknvfhykfl1cl4ibgilyvj3nf2127rwirb7kr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal base base-compat-batteries bytestring cmdargs containers data-default Decimal Diff directory extra filepath hashable haskeline hledger-lib lucid math-functions megaparsec mtl - old-time parsec pretty-show process regex-tdfa safe shakespeare - split tabular tasty temporary terminfo text time timeit - transformers unordered-containers utf8-string utility-ht wizards + old-time parsec process regex-tdfa safe shakespeare split tabular + tasty temporary terminfo text time timeit transformers + unordered-containers utf8-string utility-ht wizards ]; executableHaskellDepends = [ aeson ansi-terminal base base-compat-batteries bytestring cmdargs containers data-default Decimal directory extra filepath haskeline - hledger-lib math-functions megaparsec mtl old-time parsec - pretty-show process regex-tdfa safe shakespeare split tabular tasty - temporary terminfo text time timeit transformers - unordered-containers utf8-string utility-ht wizards + hledger-lib math-functions megaparsec mtl old-time parsec process + regex-tdfa safe shakespeare split tabular tasty temporary terminfo + text time timeit transformers unordered-containers utf8-string + utility-ht wizards ]; testHaskellDepends = [ aeson ansi-terminal base base-compat-batteries bytestring cmdargs containers data-default Decimal directory extra filepath haskeline - hledger-lib math-functions megaparsec mtl old-time parsec - pretty-show process regex-tdfa safe shakespeare split tabular tasty - temporary terminfo text time timeit transformers - unordered-containers utf8-string utility-ht wizards + hledger-lib math-functions megaparsec mtl old-time parsec process + regex-tdfa safe shakespeare split tabular tasty temporary terminfo + text time timeit transformers unordered-containers utf8-string + utility-ht wizards ]; description = "Command-line interface for the hledger accounting system"; license = stdenv.lib.licenses.gpl3; @@ -126974,8 +127882,8 @@ self: { pname = "hledger-iadd"; version = "1.3.12"; sha256 = "0klrqss2ch4yi50m1rybznzsjg4ahbx7rg9n8w5svpf34fdlp048"; - revision = "1"; - editedCabalFile = "0amfrcwklqzpjkgr714d0as57m5ndaywi04d44ygvq2p5jd0h129"; + revision = "2"; + editedCabalFile = "1n43j7fh3d9f8jn1y40vhkfh7yfwb4sixm3wyrfj20mkr7yyr732"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127005,6 +127913,8 @@ self: { pname = "hledger-interest"; version = "1.6.0"; sha256 = "0s0pmdm1vk4ib5ncs9mxyzr3dx5m6ji9778kddzqwxc9y9gvq5sq"; + revision = "1"; + editedCabalFile = "10v3fwyzbaqzrldaswvn031hncxy2sra302n10k4zkxg41bz7f73"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -127039,33 +127949,33 @@ self: { ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base , base-compat-batteries, blaze-markup, bytestring, call-stack , cassava, cassava-megaparsec, cmdargs, containers, data-default - , Decimal, directory, doctest, extra, fgl, file-embed, filepath - , Glob, hashtables, megaparsec, mtl, old-time, parsec - , parser-combinators, pretty-show, regex-tdfa, safe, split, tabular - , tasty, tasty-hunit, template-haskell, text, time, timeit - , transformers, uglymemo, unordered-containers, utf8-string + , Decimal, directory, doctest, extra, file-embed, filepath, Glob + , hashtables, megaparsec, mtl, old-time, parsec, parser-combinators + , pretty-simple, regex-tdfa, safe, split, tabular, tasty + , tasty-hunit, template-haskell, text, time, timeit, transformers + , uglymemo, unordered-containers, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.19.1"; - sha256 = "0py11011r358nmnvwwkc8mlx6mpy36jm8sqlr4i8ihx3x0zjdgya"; + version = "1.20.1"; + sha256 = "1kh65sci79aa6yc4vqb6mq4i1gj41hrnc5blwzn5gxh4nzhw6jy1"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec - cmdargs containers data-default Decimal directory extra fgl - file-embed filepath Glob hashtables megaparsec mtl old-time parsec - parser-combinators pretty-show regex-tdfa safe split tabular tasty - tasty-hunit template-haskell text time timeit transformers uglymemo - unordered-containers utf8-string + cmdargs containers data-default Decimal directory extra file-embed + filepath Glob hashtables megaparsec mtl old-time parsec + parser-combinators pretty-simple regex-tdfa safe split tabular + tasty tasty-hunit template-haskell text time timeit transformers + uglymemo unordered-containers utf8-string ]; testHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec - cmdargs containers data-default Decimal directory doctest extra fgl + cmdargs containers data-default Decimal directory doctest extra file-embed filepath Glob hashtables megaparsec mtl old-time parsec - parser-combinators pretty-show regex-tdfa safe split tabular tasty - tasty-hunit template-haskell text time timeit transformers uglymemo - unordered-containers utf8-string + parser-combinators pretty-simple regex-tdfa safe split tabular + tasty tasty-hunit template-haskell text time timeit transformers + uglymemo unordered-containers utf8-string ]; description = "A reusable library providing the core functionality of hledger"; license = stdenv.lib.licenses.gpl3; @@ -127119,21 +128029,20 @@ self: { ({ mkDerivation, ansi-terminal, async, base, base-compat-batteries , brick, cmdargs, containers, data-default, directory, extra , filepath, fsnotify, hledger, hledger-lib, megaparsec, microlens - , microlens-platform, pretty-show, process, safe, split, text - , text-zipper, time, transformers, unix, vector, vty + , microlens-platform, process, safe, split, text, text-zipper, time + , transformers, unix, vector, vty }: mkDerivation { pname = "hledger-ui"; - version = "1.19.1"; - sha256 = "17iz82jr89qxfd7j6q16w2jjr38mb7d94p3rbp0ks01bf4rlq5fl"; + version = "1.20.1"; + sha256 = "0dx71yzzvizjmvikb4pbd4zg272k7xrhfp1s76v2bmc9gqq0n6yc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ ansi-terminal async base base-compat-batteries brick cmdargs containers data-default directory extra filepath fsnotify hledger - hledger-lib megaparsec microlens microlens-platform pretty-show - process safe split text text-zipper time transformers unix vector - vty + hledger-lib megaparsec microlens microlens-platform process safe + split text text-zipper time transformers unix vector vty ]; description = "Curses-style terminal interface for the hledger accounting system"; license = stdenv.lib.licenses.gpl3; @@ -127163,30 +128072,33 @@ self: { ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , case-insensitive, clientsession, cmdargs, conduit, conduit-extra , containers, data-default, Decimal, directory, extra, filepath - , hjsmin, hledger, hledger-lib, http-client, http-conduit + , hjsmin, hledger, hledger-lib, hspec, http-client, http-conduit , http-types, megaparsec, mtl, network, shakespeare , template-haskell, text, time, transformers, unix-compat , unordered-containers, utf8-string, wai, wai-cors, wai-extra , wai-handler-launch, warp, yaml, yesod, yesod-core, yesod-form - , yesod-static + , yesod-static, yesod-test }: mkDerivation { pname = "hledger-web"; - version = "1.19.1"; - sha256 = "03wak0dgxhf7y2mc2az4xcypgz1z1lf65vn6kj98z063pmlwp1b0"; + version = "1.20.1"; + sha256 = "0s4vg3vfcvp4krm5n5hjys0sa5gvf2pvdcmp5l967z18iqi3zj8l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base blaze-html blaze-markup bytestring case-insensitive clientsession cmdargs conduit conduit-extra containers data-default - Decimal directory extra filepath hjsmin hledger hledger-lib + Decimal directory extra filepath hjsmin hledger hledger-lib hspec http-client http-conduit http-types megaparsec mtl network shakespeare template-haskell text time transformers unix-compat unordered-containers utf8-string wai wai-cors wai-extra wai-handler-launch warp yaml yesod yesod-core yesod-form - yesod-static + yesod-static yesod-test ]; executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base hledger hledger-lib hspec text yesod yesod-test + ]; description = "Web-based user interface for the hledger accounting system"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; @@ -127388,17 +128300,15 @@ self: { "hlrdb" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptonite , hashable, hedis, hlrdb-core, memory, random, store, time - , unordered-containers + , unordered-containers, zstd }: mkDerivation { pname = "hlrdb"; - version = "0.3.1.0"; - sha256 = "19sxpyv331sjldanf40gw598gcj98n9xwc985cz9k2m38ck3vwhr"; - revision = "2"; - editedCabalFile = "11f2vv95kmk4k07yzvzma7714p148sfyn9k3zx94h5y0zihgn49g"; + version = "0.3.2.0"; + sha256 = "1k4dsd4h3fv1ag753gwxvirfrj53ra4ik948pyacq31c16mz1l2p"; libraryHaskellDepends = [ base base64-bytestring bytestring cryptonite hashable hedis - hlrdb-core memory random store time unordered-containers + hlrdb-core memory random store time unordered-containers zstd ]; description = "High-level Redis Database"; license = stdenv.lib.licenses.mit; @@ -127447,8 +128357,8 @@ self: { }: mkDerivation { pname = "hls-plugin-api"; - version = "0.5.0.0"; - sha256 = "18bahpndgic8g259v4blckybc5mlp7snaqh1gmnd7kh39p8kf1v4"; + version = "0.5.0.1"; + sha256 = "0sv892m18ic9m8d5b8wm7385v80rc02fjy0wxvq9mzhgazz20cp2"; libraryHaskellDepends = [ aeson base containers data-default Diff ghc ghc-boot-th ghcide hashable haskell-lsp hslogger lens process regex-tdfa shake text @@ -128205,8 +129115,8 @@ self: { }: mkDerivation { pname = "hnix"; - version = "0.11.0"; - sha256 = "01m23sn3r2pr6ldblk4m41y082jc0lrgpfzbx63sx168ldhwxar3"; + version = "0.11.1"; + sha256 = "0rdl1ky8l2zm5arkdq77qrg0xnqfavba0bnr9bd0zhjj3k2gb4v7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128795,8 +129705,6 @@ self: { libraryHaskellDepends = [ base either mtl ]; description = "Some convenience facilities for hoisting errors into a monad"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hol" = callPackage @@ -130162,8 +131070,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.34.2"; - sha256 = "0sn99v1bndbn1if36i4xj1xqcxpihh6yj8ssixypnpwi5vm7hvyf"; + version = "0.34.3"; + sha256 = "0gwqmv3p3g9551n405bxrwm7a5ysx3q72q04k5qmicb3mxwwxnff"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131331,8 +132239,7 @@ self: { "hs-brotli" = callPackage ({ mkDerivation, base, brotli, brotlidec, brotlienc, bytestring - , ghc-prim, libbrotlidec, libbrotlienc, QuickCheck - , quickcheck-instances, tasty-quickcheck + , ghc-prim, QuickCheck, quickcheck-instances, tasty-quickcheck }: mkDerivation { pname = "hs-brotli"; @@ -131340,7 +132247,6 @@ self: { sha256 = "083l7bbjlxh629a9m88mfp087f09gwsmzs9vmpxrqffw23zrnclf"; libraryHaskellDepends = [ base bytestring ghc-prim ]; librarySystemDepends = [ brotlidec brotlienc ]; - libraryPkgconfigDepends = [ libbrotlidec libbrotlienc ]; testHaskellDepends = [ base brotli bytestring QuickCheck quickcheck-instances tasty-quickcheck @@ -131349,8 +132255,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {brotlidec = null; brotlienc = null; libbrotlidec = null; - libbrotlienc = null;}; + }) {brotlidec = null; brotlienc = null;}; "hs-captcha" = callPackage ({ mkDerivation, base, bytestring, gd, random }: @@ -131989,8 +132894,8 @@ self: { }: mkDerivation { pname = "hs-speedscope"; - version = "0.2"; - sha256 = "119s4da40zjf42s7fyjm4b78vciiv5r2f67l8ki9gqr933ir6mpb"; + version = "0.2.1"; + sha256 = "1qzmcn718mbg5pckvbcw2n36srmbixkyp45hrkdcdnqcsvf5agln"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134475,8 +135380,8 @@ self: { }: mkDerivation { pname = "hspec-expectations-json"; - version = "1.0.0.0"; - sha256 = "1i6w3qsy25y0aymkcnkycpgrx0dkbsv5a60004hx3fpl5rkbq1aj"; + version = "1.0.0.2"; + sha256 = "1jv0mi0hdbxx75yygd3184kqpi50ysjp82vyr1di7dcz0ffyxhmb"; libraryHaskellDepends = [ aeson aeson-pretty base Diff HUnit scientific text unordered-containers vector @@ -135042,15 +135947,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-wai_0_11_0" = callPackage + "hspec-wai_0_11_1" = callPackage ({ mkDerivation, base, base-compat, bytestring, case-insensitive , hspec, hspec-core, hspec-expectations, http-types, QuickCheck , text, transformers, wai, wai-extra }: mkDerivation { pname = "hspec-wai"; - version = "0.11.0"; - sha256 = "0fk23vrs5apjy11z47mply2kay3n193gnyrbb9fkpwvmxyhxlp0x"; + version = "0.11.1"; + sha256 = "03wiksic5y9a2g6a86nsxrnajdgdvpv17w02h5qla0zp9zs6pa1j"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive hspec-core hspec-expectations http-types QuickCheck text transformers wai @@ -137091,36 +137996,6 @@ self: { , case-insensitive, conduit, conduit-extra, connection, cookie , data-default-class, hspec, http-client, http-client-tls , http-types, HUnit, mtl, network, resourcet, streaming-commons - , temporary, text, time, transformers, unliftio, unliftio-core - , utf8-string, wai, wai-conduit, warp, warp-tls - }: - mkDerivation { - pname = "http-conduit"; - version = "2.3.7.3"; - sha256 = "00rshi1y0h8y4rvsnnad0bppxgpvp40sk7lw1kxmdwy8pi8xrvbs"; - revision = "1"; - editedCabalFile = "0d9mkg8wm943avghjwvq986m667fx63pvvgn2y8gvr6nla8740an"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit conduit-extra http-client - http-client-tls http-types mtl resourcet transformers unliftio-core - ]; - testHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive conduit - conduit-extra connection cookie data-default-class hspec - http-client http-types HUnit network resourcet streaming-commons - temporary text time transformers unliftio utf8-string wai - wai-conduit warp warp-tls - ]; - doCheck = false; - description = "HTTP client package with conduit interface and HTTPS support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-conduit_2_3_7_4" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring - , case-insensitive, conduit, conduit-extra, connection, cookie - , data-default-class, hspec, http-client, http-client-tls - , http-types, HUnit, mtl, network, resourcet, streaming-commons , temporary, text, time, tls, transformers, unliftio, unliftio-core , utf8-string, wai, wai-conduit, warp, warp-tls }: @@ -137142,7 +138017,6 @@ self: { doCheck = false; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-conduit-browser" = callPackage @@ -137708,19 +138582,19 @@ self: { "http-rfc7807" = callPackage ({ mkDerivation, aeson, base, call-stack, hspec-expectations-json - , http-media, http-types, servant, servant-server, tasty + , http-media, http-types, HUnit, servant, servant-server, tasty , tasty-hunit, text }: mkDerivation { pname = "http-rfc7807"; - version = "0.1.0.0"; - sha256 = "1wysqi3rfyg1fb7p9plb6ihcqzvyb2cqhsfx46ciwgym9nxg8lr4"; + version = "0.2.0.0"; + sha256 = "0nhdz37sjy2qam2a8zvsx7xpnqykc4z0zhg7a8ii6nmxvfmsbywv"; libraryHaskellDepends = [ aeson base http-media http-types servant servant-server text ]; testHaskellDepends = [ - aeson base call-stack hspec-expectations-json tasty tasty-hunit - text + aeson base call-stack hspec-expectations-json http-types HUnit + servant servant-server tasty tasty-hunit text ]; description = "RFC7807 style response messages"; license = stdenv.lib.licenses.bsd3; @@ -138300,6 +139174,36 @@ self: { broken = true; }) {}; + "hum" = callPackage + ({ mkDerivation, base, brick, bytestring, containers, directory + , filepath, lens, libmpd, mtl, relude, template-haskell, text + , text-zipper, time, transformers, vector, vty, witherable-class + }: + mkDerivation { + pname = "hum"; + version = "0.1.0.0"; + sha256 = "06zyjg2i0kk4wnzrcax7rff710rpafqwz4rv75wq09vr65wvvj1y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base brick bytestring containers directory filepath lens libmpd mtl + relude template-haskell text text-zipper time transformers vector + vty witherable-class + ]; + executableHaskellDepends = [ + base brick bytestring containers directory filepath lens libmpd mtl + relude template-haskell text text-zipper time transformers vector + vty witherable-class + ]; + testHaskellDepends = [ + base brick bytestring containers directory filepath lens libmpd mtl + relude template-haskell text text-zipper time transformers vector + vty witherable-class + ]; + description = "A TUI MPD client, inspired by ncmpcpp"; + license = stdenv.lib.licenses.gpl2Plus; + }) {}; + "human-parse" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -138630,8 +139534,8 @@ self: { }: mkDerivation { pname = "hurl"; - version = "1.4.2.1"; - sha256 = "158p0fnlvz03vj29q4b5lzv4070d3l64wa1zsg9v2xlcrr6lrp87"; + version = "1.5.0.0"; + sha256 = "1fzy2zzwn5x420xz91fj64h6g0vzlam4058pymb2pdmg4x801j42"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141428,8 +142332,8 @@ self: { }: mkDerivation { pname = "icepeak"; - version = "0.7.3.0"; - sha256 = "0in02r708s5j8n22900jvnf4iiw87bvs1q5mjmr1yc4vn8vrf4vv"; + version = "0.7.4.0"; + sha256 = "1jjcjl0i9brdzflfz4b7fba420rwgmv74b1qz7ii6m4bd7i4jkzp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142809,35 +143713,34 @@ self: { }) {}; "imm" = callPackage - ({ mkDerivation, aeson, aeson-pretty, async, atom-conduit - , base-noprelude, beam-core, beam-sqlite, blaze-html, blaze-markup - , bytestring, chronos, co-log, conduit, containers, dhall - , directory, filepath, http-client, http-types, microlens - , mime-mail, monad-time, optparse-applicative, parsec, parsers - , pipes, pipes-bytestring, pipes-http, prettyprinter - , prettyprinter-ansi-terminal, refined, relude, rss-conduit, safe - , safe-exceptions, sqlite-simple, stm, stm-chans, streamly, text - , time, timerep, typed-process, typerep-map, uri-bytestring - , xml-conduit, xml-types + ({ mkDerivation, aeson, aeson-pretty, async, atom-conduit, base + , beam-core, beam-sqlite, blaze-html, blaze-markup, bytestring + , chronos, co-log, conduit, containers, dhall, directory, filepath + , http-client, http-types, microlens, mime-mail, monad-time + , optparse-applicative, parsec, parsers, pipes, pipes-bytestring + , pipes-http, prettyprinter, prettyprinter-ansi-terminal, refined + , relude, rss-conduit, safe, safe-exceptions, sqlite-simple, stm + , stm-chans, streamly, text, time, timerep, typed-process + , typerep-map, uri-bytestring, xml-conduit, xml-types }: mkDerivation { pname = "imm"; - version = "2.0.0.0"; - sha256 = "1qkq80iiv1yql59a8vly1nv36isnh2wkdzxgawjh22xqn9xn0csd"; + version = "2.1.0.0"; + sha256 = "01jpwxqp2c5ih9cw38w4j7x1dff0z7z1d43yx1rri83w8shpjbl3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson aeson-pretty atom-conduit base-noprelude conduit containers - dhall directory filepath http-client microlens parsec parsers pipes + aeson aeson-pretty atom-conduit base conduit containers dhall + directory filepath http-client microlens parsec parsers pipes pipes-bytestring prettyprinter prettyprinter-ansi-terminal refined relude rss-conduit safe safe-exceptions text time timerep typed-process uri-bytestring xml-conduit xml-types ]; executableHaskellDepends = [ - aeson async base-noprelude beam-core beam-sqlite blaze-html - blaze-markup bytestring chronos co-log conduit containers dhall - directory filepath http-types microlens mime-mail monad-time + aeson async base beam-core beam-sqlite blaze-html blaze-markup + bytestring chronos co-log conduit containers dhall directory + filepath http-types microlens mime-mail monad-time optparse-applicative pipes pipes-bytestring pipes-http prettyprinter prettyprinter-ansi-terminal refined relude safe safe-exceptions sqlite-simple stm stm-chans streamly text time @@ -143439,6 +144342,30 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "incremental-parser_0_5_0_1" = callPackage + ({ mkDerivation, base, bytestring, checkers, criterion, deepseq + , input-parsers, monoid-subclasses, parsers, QuickCheck + , rank2classes, tasty, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.5.0.1"; + sha256 = "1j0x52rwp44wdjdyxw3jh6m61vhwa2bf80dfxhqi6iniyc8qzm68"; + libraryHaskellDepends = [ + base input-parsers monoid-subclasses parsers rank2classes + transformers + ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq monoid-subclasses text + ]; + description = "Generic parser library capable of providing partial results from partial input"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -143696,6 +144623,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "indexed-traversable" = callPackage + ({ mkDerivation, array, base, containers, transformers }: + mkDerivation { + pname = "indexed-traversable"; + version = "0.1"; + sha256 = "1pn0i2zn3qrzmj58aa32vr9fjdr7sh8h50v7yab76q8zxwpxnhlz"; + libraryHaskellDepends = [ array base containers transformers ]; + description = "FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "indexed-traversable-instances" = callPackage + ({ mkDerivation, base, containers, criterion, indexed-traversable + , QuickCheck, quickcheck-instances, tagged, tasty, tasty-quickcheck + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "indexed-traversable-instances"; + version = "0.1"; + sha256 = "1p38mssyajhwgc7ljnr31q6g18dxbv8r88z1r188xd82g6049v7s"; + libraryHaskellDepends = [ + base indexed-traversable tagged unordered-containers vector + ]; + testHaskellDepends = [ + base containers indexed-traversable QuickCheck quickcheck-instances + tasty tasty-quickcheck transformers unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base containers criterion indexed-traversable unordered-containers + vector + ]; + description = "More instances of FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "indextype" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -143766,22 +144728,24 @@ self: { }) {}; "indigo" = callPackage - ({ mkDerivation, base, cleveland, constraints, containers + ({ mkDerivation, base, casing, cleveland, constraints, containers , directory, fmt, hedgehog, hspec-expectations, HUnit, lorentz - , megaparsec, morley, morley-prelude, optparse-applicative, process - , reflection, shelly, singletons, string-interpolate, summoner - , tasty, tasty-discover, tasty-hedgehog, tasty-hunit-compat, text - , vinyl, with-utf8 + , megaparsec, microlens-th, morley, morley-prelude + , optparse-applicative, process, reflection, shelly, singletons + , string-interpolate, summoner, tasty, tasty-discover + , tasty-hedgehog, tasty-hunit-compat, template-haskell, text, vinyl + , with-utf8 }: mkDerivation { pname = "indigo"; - version = "0.3.1"; - sha256 = "1xc2gk7bihgpv78cl1c15x1izwsazmdpdsagan4d6yd0zw30xci4"; + version = "0.4"; + sha256 = "1qa6xbzyfl1f1c6kw71b0zi538zxql07kidkmsjz91sy9nrc93ml"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base constraints containers lorentz morley morley-prelude - reflection singletons vinyl with-utf8 + base casing constraints containers fmt lorentz microlens-th morley + morley-prelude reflection singletons template-haskell vinyl + with-utf8 ]; executableHaskellDepends = [ base directory megaparsec morley morley-prelude @@ -144270,8 +145234,8 @@ self: { }: mkDerivation { pname = "inline-r"; - version = "0.10.3"; - sha256 = "15wkf1lxc7syp6kcf7d10lxn013q5mnvdl113sbhnchq92q7npgj"; + version = "0.10.4"; + sha256 = "0jvfi2izhxn0n5xzz6rhhfs3fxlx7p1mhd9pjrazqckib14jw8ml"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deepseq exceptions inline-c mtl pretty primitive process reflection setenv @@ -145325,22 +146289,21 @@ self: { "intricacy" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , crypto-api, crypto-pubkey-types, cryptohash, directory, filepath - , hscurses, mtl, ncurses, network-fancy, random, RSA, safe, SDL - , SDL-gfx, SDL-mixer, SDL-ttf, stm, time, transformers, vector + , cryptonite, directory, exceptions, filepath, hscurses, memory + , mtl, ncurses, network-fancy, random, safe, SDL, SDL-gfx + , SDL-mixer, SDL-ttf, stm, time, transformers, vector }: mkDerivation { pname = "intricacy"; - version = "0.7.2.3"; - sha256 = "1651ivbk4iiwhy5hwwhc8s2dgfxdm9f4hswfxkdb06yp7i6y2pyj"; + version = "0.8.0.1"; + sha256 = "0kyhswgg8iyxvicgpf0f5rn3gk4k620crk02xd4bn797xws5bzzs"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - array base binary bytestring containers crypto-api - crypto-pubkey-types cryptohash directory filepath hscurses mtl - network-fancy random RSA safe SDL SDL-gfx SDL-mixer SDL-ttf stm - time transformers vector + array base binary bytestring containers cryptonite directory + exceptions filepath hscurses memory mtl network-fancy random safe + SDL SDL-gfx SDL-mixer SDL-ttf stm time transformers vector ]; executablePkgconfigDepends = [ ncurses ]; description = "A game of competitive puzzle-design"; @@ -146130,6 +147093,8 @@ self: { pname = "iproute"; version = "1.7.10"; sha256 = "0libq5v22cm6bj1lga1rrkgww50bhnpns7rz7da90yycqv2k7d5m"; + revision = "1"; + editedCabalFile = "02nh8r0c1p8gzq2y82q8n210y3bs146kjv2v7mr8z0m3k0sh5qqs"; libraryHaskellDepends = [ appar base byteorder bytestring containers network ]; @@ -151120,6 +152085,22 @@ self: { broken = true; }) {}; + "katip-logstash" = callPackage + ({ mkDerivation, aeson, base, katip, logstash, retry, stm + , stm-chans, text, transformers, unliftio + }: + mkDerivation { + pname = "katip-logstash"; + version = "0.1.0.0"; + sha256 = "16rw2bxbi5kklz6pz8zj7dq7as58v4yfjq7npnlyyx658nvhia6l"; + libraryHaskellDepends = [ + aeson base katip logstash retry stm stm-chans text transformers + unliftio + ]; + description = "Logstash backend for katip"; + license = stdenv.lib.licenses.mit; + }) {}; + "katip-logzio" = callPackage ({ mkDerivation, aeson, async, base, bytestring, errors, hedgehog , hostname, http-client, http-client-tls, http-types, katip, retry @@ -151146,6 +152127,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "katip-raven" = callPackage + ({ mkDerivation, aeson, base, katip, raven-haskell, string-conv + , text, unordered-containers + }: + mkDerivation { + pname = "katip-raven"; + version = "0.1.0.0"; + sha256 = "107hb8rn6si77ms9hp72494ah4ismfivkf8xgldy1jk2ifqgxc0d"; + libraryHaskellDepends = [ + aeson base katip raven-haskell string-conv text + unordered-containers + ]; + description = "Katip scribe for raven (https://sentry.io)"; + license = stdenv.lib.licenses.asl20; + }) {}; + "katip-rollbar" = callPackage ({ mkDerivation, aeson, async, base, hostname, http-client, katip , rollbar-hs, stm-chans, text, time @@ -151916,8 +152913,8 @@ self: { }: mkDerivation { pname = "kempe"; - version = "0.1.0.1"; - sha256 = "0wnjljwnwy9qq575v493y2dsbimks3plbsripfrjph0ldpianrdm"; + version = "0.1.1.1"; + sha256 = "0mianbsn02vzbb0fr6pgxsij0jrpnhmbah9n2fcl3fj9xzcb6ac7"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -151927,10 +152924,12 @@ self: { transformers ]; libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base optparse-applicative ]; + executableHaskellDepends = [ + base bytestring optparse-applicative prettyprinter + ]; testHaskellDepends = [ - base bytestring deepseq filepath prettyprinter process tasty - tasty-golden tasty-hunit temporary + base bytestring composition-prelude deepseq filepath prettyprinter + process tasty tasty-golden tasty-hunit temporary text ]; benchmarkHaskellDepends = [ base bytestring criterion prettyprinter text @@ -152132,6 +153131,17 @@ self: { broken = true; }) {}; + "keylayouts" = callPackage + ({ mkDerivation, base, bytestring, containers, text, xeno }: + mkDerivation { + pname = "keylayouts"; + version = "0.1.0.2"; + sha256 = "0hf7lmx8bgl5lh1i71x56nfbgnp8xrqfza3s5acq9i16g21ri292"; + libraryHaskellDepends = [ base bytestring containers text xeno ]; + description = "Tools for macOS .keylayout files"; + license = stdenv.lib.licenses.mit; + }) {}; + "keyring" = callPackage ({ mkDerivation, base, udbus }: mkDerivation { @@ -152206,8 +153216,8 @@ self: { }: mkDerivation { pname = "keystore"; - version = "0.8.1.1"; - sha256 = "013cvfp8cfj90lj4n41g8wwrv6xj3iql4m3zzawmpxzkqwmflsqy"; + version = "0.8.2.0"; + sha256 = "1y91mdy9gpzwxcf2h9s4afs9lzyxrffq4qhrip0ygvyd8qr8x95m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -152292,16 +153302,14 @@ self: { }) {}; "ki" = callPackage - ({ mkDerivation, base, concurrency, containers, dejafu, stm }: + ({ mkDerivation, base, containers, stm }: mkDerivation { pname = "ki"; - version = "0.1.0.1"; - sha256 = "16hw0y7r76gqhn3qnr8ac49yr1xq33g6rcfh8zxgkg59zf5bl35a"; - revision = "1"; - editedCabalFile = "03j64ya9n2ck6ddqk3dsvghnnqq6pfc6l9q4xj9ir8ry5cgxhrqp"; + version = "0.2.0.1"; + sha256 = "1nxmgv4kxh2whdsmj659iypf8gfjrqzyxzyzghapg1fmpffjpcyr"; libraryHaskellDepends = [ base containers stm ]; - testHaskellDepends = [ base concurrency dejafu stm ]; - description = "A lightweight, structured concurrency library"; + testHaskellDepends = [ base stm ]; + description = "A lightweight, structured-concurrency library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -154435,17 +155443,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "language-c_0_9" = callPackage + "language-c_0_9_0_1" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers, deepseq - , directory, filepath, happy, mtl, pretty, process, syb + , directory, filepath, happy, mtl, pretty, process }: mkDerivation { pname = "language-c"; - version = "0.9"; - sha256 = "0a2z97ajdbql583jcganadi9frqj09cidqb1hlh0gl6w6aj82kii"; + version = "0.9.0.1"; + sha256 = "01yj353n85qcv9zvaf19f1260rip26h6gxqahplkx9fy7ybbnk6l"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath mtl - pretty process syb + pretty process ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base directory filepath process ]; @@ -157204,8 +158212,8 @@ self: { pname = "lens-aeson"; version = "1.1"; sha256 = "03n9dkdyqkkf15h8k4c4bjwgjcbbs2an2cf6z8x54nvkjmprrg7p"; - revision = "2"; - editedCabalFile = "1ivxsj7igrrrzkwhw7ipcxnnr721797is6yfsrh3mha9dl8985sf"; + revision = "3"; + editedCabalFile = "10zm8r29c3hb5saxv3ryr67nsg8rf4dk67yjwysasd3jpkxghj5p"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text @@ -157743,8 +158751,8 @@ self: { }: mkDerivation { pname = "less-arbitrary"; - version = "0.1.0.2"; - sha256 = "0xqhlk4qqykb173pm6akd7jvygm5ya3qqw3xc649aiq053ralvif"; + version = "0.1.4.0"; + sha256 = "1rd21mnvr3wwzbl09070jmzbg7zl05kviaggpycyxybj4sq8lxm3"; libraryHaskellDepends = [ base containers email-validate generic-arbitrary genvalidity genvalidity-hspec genvalidity-property hashable hspec mtl @@ -158105,8 +159113,8 @@ self: { }: mkDerivation { pname = "libarchive"; - version = "3.0.1.1"; - sha256 = "1i5801prr06vachxrpcc31bsxhsb6f8ik91mx7a9hmqkwhpr986b"; + version = "3.0.2.0"; + sha256 = "1v6mx8li7dp1pzp6qzsql3hcapj7l7ia3b3nala0xzw2r7jvmc4l"; setupHaskellDepends = [ base Cabal chs-cabal ]; libraryHaskellDepends = [ base bytestring composition-prelude deepseq dlist filepath mtl @@ -158966,6 +159974,18 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {inherit (pkgs) libtelnet;}; + "libversion" = callPackage + ({ mkDerivation, base, bytestring, libversion }: + mkDerivation { + pname = "libversion"; + version = "0.1.0"; + sha256 = "0w5maaklglbxp7k0ah699w1mhjsjrpgw9n7axld319dpfdwhl94j"; + libraryHaskellDepends = [ base bytestring ]; + libraryPkgconfigDepends = [ libversion ]; + description = "Haskell binding to libversion"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) libversion;}; + "libvirt-hs" = callPackage ({ mkDerivation, base, c2hs, libvirt, syb, unix }: mkDerivation { @@ -162700,8 +163720,8 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.3.11"; - sha256 = "1r5qfip5xl22hq2v27b1lkcknixmc40wm7iya7vs3mrnwyavpmdb"; + version = "1.3.12"; + sha256 = "1bbh7aq3sbyya0w4p0qkkrryy7mpxw4s4cj2s6zvdsqq9fg2fpda"; libraryHaskellDepends = [ async base exceptions free monad-control mtl prettyprinter semigroups stm stm-delay text time transformers transformers-base @@ -162942,6 +163962,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "logstash" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, data-default-class + , exceptions, monad-control, mtl, network, resource-pool, resourcet + , retry, stm, stm-chans, time, tls, unbounded-delays, unliftio + }: + mkDerivation { + pname = "logstash"; + version = "0.1.0.1"; + sha256 = "1hi77m4iijrkyg3v2g6m0yqh1vga35sbh9nq22g9mdflsv353ffi"; + libraryHaskellDepends = [ + aeson async base bytestring data-default-class exceptions + monad-control mtl network resource-pool resourcet retry stm + stm-chans time tls unbounded-delays unliftio + ]; + description = "Logstash client library for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "lojban" = callPackage ({ mkDerivation, base, containers, curl, directory, haskell98, HTTP , markov-chain, mtl, parsec, process, random, regex-compat, strict @@ -164257,8 +165295,8 @@ self: { }: mkDerivation { pname = "lumberjack"; - version = "0.1.0.3"; - sha256 = "03y9v9ajh89ffacmnq0zfb83dyk6gd72msln7kksb69kkgcizd96"; + version = "1.0.0.0"; + sha256 = "1avv2qsncq10dfx3kqvd7q9dzwk1wmf39a61zw2cr8a8jpg89mfi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165459,6 +166497,25 @@ self: { broken = true; }) {}; + "mail-reports" = callPackage + ({ mkDerivation, aeson, base, bytestring, mtl, resourcet, streaming + , streaming-bytestring, streaming-utils, text, time, xml + , zip-archive + }: + mkDerivation { + pname = "mail-reports"; + version = "0.2.0.0"; + sha256 = "1g3jazpcyhsmiz9i9vx0n784n2n9nqzrbbnjhjlzji2si9gnkg9z"; + libraryHaskellDepends = [ + aeson base bytestring mtl resourcet streaming streaming-bytestring + streaming-utils text time xml zip-archive + ]; + description = "A parser library for DMARC and SMTP TLS reports"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "mailbox-count" = callPackage ({ mkDerivation, base, cmdargs, configurator, containers, directory , doctest, filemanip, filepath, HDBC, HDBC-postgresql, HDBC-sqlite3 @@ -166920,8 +167977,30 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.5.7.0"; - sha256 = "04vv16h048gkfgqsdf3a42qrg62cik9j30p4s13rykq0shzcaf62"; + version = "0.5.8.0"; + sha256 = "0p469736yydr7lbfr4vd51al4mvx6fb4s9zxc420fvb9f7v00jsb"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq exceptions primitive + scheduler unliftio-core vector + ]; + testHaskellDepends = [ + base doctest mersenne-random-pure64 QuickCheck random splitmix + template-haskell + ]; + description = "Massiv (Массив) is an Array Library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "massiv_0_5_9_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, deepseq + , doctest, exceptions, mersenne-random-pure64, primitive + , QuickCheck, random, scheduler, splitmix, template-haskell + , unliftio-core, vector + }: + mkDerivation { + pname = "massiv"; + version = "0.5.9.0"; + sha256 = "11i527mnyznpyqwr61cr3jhx4xs3y8m7948mqp6rwkis6lnvl2ms"; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions primitive scheduler unliftio-core vector @@ -166932,6 +168011,7 @@ self: { ]; description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "massiv-io" = callPackage @@ -167000,6 +168080,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "massiv-test_0_1_6" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec + , massiv, mwc-random, primitive, QuickCheck, scheduler, unliftio + , vector + }: + mkDerivation { + pname = "massiv-test"; + version = "0.1.6"; + sha256 = "1cg41rkk19jyvkkx3nkd10lq738cg5kv29nrzwxqcm5v308av38i"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq exceptions hspec massiv + primitive QuickCheck scheduler unliftio vector + ]; + testHaskellDepends = [ + base bytestring containers data-default deepseq genvalidity-hspec + hspec massiv mwc-random primitive QuickCheck scheduler vector + ]; + description = "Library that contains generators, properties and tests for Massiv Array Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "master-plan" = callPackage ({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific , hspec, megaparsec, mtl, optparse-applicative, QuickCheck @@ -168011,6 +169114,34 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "mcmc_0_4_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, circular, containers + , criterion, data-default, deepseq, directory, dirichlet + , double-conversion, hspec, log-domain, microlens, monad-parallel + , mwc-random, pretty-show, primitive, statistics, time + , transformers, vector, zlib + }: + mkDerivation { + pname = "mcmc"; + version = "0.4.0.0"; + sha256 = "1wfp73qis73xmzxwbxx3r9z55x6ydk5c6j0daf81zyllkv4mw9v4"; + libraryHaskellDepends = [ + aeson base bytestring circular containers data-default deepseq + directory dirichlet double-conversion log-domain microlens + monad-parallel mwc-random pretty-show primitive statistics time + transformers vector zlib + ]; + testHaskellDepends = [ + base hspec log-domain mwc-random statistics + ]; + benchmarkHaskellDepends = [ + base criterion log-domain microlens mwc-random + ]; + description = "Sample from a posterior using Markov chain Monte Carlo"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mcmc-samplers" = callPackage ({ mkDerivation, base, containers, hakaru, hmatrix, mwc-random , primitive, statistics @@ -168534,6 +169665,8 @@ self: { pname = "megaparsec"; version = "9.0.1"; sha256 = "00953zvxfyjibw8c1ssmixxh0cwn59pz24zbh6s34rk3v14vqa3j"; + revision = "1"; + editedCabalFile = "00vjc5b1x6yd0jqsbcahvghlkwai65dl1ib6744a0lhsa9vsni12"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -168555,6 +169688,8 @@ self: { pname = "megaparsec-tests"; version = "9.0.1"; sha256 = "0synm14x1k9r5q7xmv21z0y95b42g7lvwn78mcnc3cx62x6393ng"; + revision = "1"; + editedCabalFile = "1iz18gmhqvxwiw6r35nd6p2m3zjpzsy0bzhwgbfxpjbvvcgy8736"; libraryHaskellDepends = [ base bytestring containers hspec hspec-expectations hspec-megaparsec megaparsec mtl QuickCheck text transformers @@ -170186,6 +171321,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microstache_1_0_1_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , directory, filepath, hspec, parsec, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "microstache"; + version = "1.0.1.2"; + sha256 = "1xdca11z5cy7vfy2dszhr6qvlrxw6pn0d9iri7mg56lvi02javik"; + libraryHaskellDepends = [ + aeson base containers deepseq directory filepath parsec text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec parsec text + ]; + description = "Mustache templates for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "microtimer" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -171631,8 +172787,8 @@ self: { }: mkDerivation { pname = "mixpanel-client"; - version = "0.2.1"; - sha256 = "1gangs1ivbg0hyc804flmxq7fgai3qlf2fnsw1r9dyjb5d91smp1"; + version = "0.3.0"; + sha256 = "1yk4p1cyw0gz9q9j7sw4mnfp2597a0k84l8ygpp2f0fndj6jmw4m"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring http-client http-client-tls servant servant-client string-conv text time @@ -171861,6 +173017,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mmsyn2-array" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "mmsyn2-array"; + version = "0.1.1.0"; + sha256 = "0dcvs5s11s840fvl17h5qrz5x6fmzvvjkfxmbk8r0p13n4k2a0ny"; + libraryHaskellDepends = [ base ]; + description = "A library with less dependencies that can be used for multiple Ord a => a -> b transformations"; + license = stdenv.lib.licenses.mit; + }) {}; + "mmsyn3" = callPackage ({ mkDerivation, base, directory }: mkDerivation { @@ -171873,20 +173040,15 @@ self: { }) {}; "mmsyn4" = callPackage - ({ mkDerivation, base, directory, mmsyn2, mmsyn3, process, vector - }: + ({ mkDerivation, base, directory, mmsyn3, process }: mkDerivation { pname = "mmsyn4"; - version = "0.5.0.0"; - sha256 = "05r33lx2cxsf7a14809dgs7lhfqlglshpv22jfzrl2xy0rl3x4qz"; + version = "0.6.3.0"; + sha256 = "06lp72rbkna5hrw8zbwz7wqijchcbc9y1nl5d1gp4z3gq1324za5"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - base directory mmsyn2 mmsyn3 process vector - ]; - executableHaskellDepends = [ - base directory mmsyn2 mmsyn3 process vector - ]; + libraryHaskellDepends = [ base directory mmsyn3 process ]; + executableHaskellDepends = [ base directory mmsyn3 process ]; description = "The \"glue\" between electronic tables and GraphViz"; license = stdenv.lib.licenses.mit; }) {}; @@ -171925,6 +173087,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mmsyn6ukr-array" = callPackage + ({ mkDerivation, base, bytestring, directory, mmsyn2-array, mmsyn3 + , mmsyn5, process, ukrainian-phonetics-basic-array + }: + mkDerivation { + pname = "mmsyn6ukr-array"; + version = "0.2.1.0"; + sha256 = "0hjpygn10k6d554nkkrmdxv6p8m2aalgs0m33j2gn7myfnzj39fl"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring directory mmsyn2-array mmsyn3 mmsyn5 process + ukrainian-phonetics-basic-array + ]; + executableHaskellDepends = [ + base bytestring directory mmsyn2-array mmsyn3 mmsyn5 process + ukrainian-phonetics-basic-array + ]; + description = "A musical instrument synthesizer or a tool for Ukrainian language listening"; + license = stdenv.lib.licenses.mit; + }) {}; + "mmsyn7h" = callPackage ({ mkDerivation, base, bytestring, directory, mmsyn2, mmsyn3 , mmsyn6ukr, mmsyn7s, mmsyn7ukr, process, vector @@ -173142,20 +174327,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger-logstash" = callPackage + ({ mkDerivation, aeson, base, logstash, monad-logger, retry, stm + , stm-chans, text, transformers, unliftio + }: + mkDerivation { + pname = "monad-logger-logstash"; + version = "0.1.0.0"; + sha256 = "1k8k5dymnjz2k4iabvwdvy8wzs8gpgqhppsr01z9r32bsslcd5ch"; + libraryHaskellDepends = [ + aeson base logstash monad-logger retry stm stm-chans text + transformers unliftio + ]; + description = "Logstash backend for monad-logger"; + license = stdenv.lib.licenses.mit; + }) {}; + "monad-logger-prefix" = callPackage - ({ mkDerivation, base, criterion, doctest, exceptions, Glob, hspec - , monad-control, monad-logger, mtl, QuickCheck, resourcet, text - , transformers, transformers-base + ({ mkDerivation, base, criterion, exceptions, monad-control + , monad-logger, mtl, resourcet, text, transformers + , transformers-base, unliftio-core }: mkDerivation { pname = "monad-logger-prefix"; - version = "0.1.11"; - sha256 = "0zw591nqgyqy37vj0vmyyd2m7v6cyx8bgwfm1xhf1ppbxhjx38nv"; + version = "0.1.12"; + sha256 = "00gsp7mhvqvfbdh75lgr73j5adw3hd4cp969h241gaw892z3qvws"; libraryHaskellDepends = [ base exceptions monad-control monad-logger mtl resourcet text - transformers transformers-base + transformers transformers-base unliftio-core ]; - testHaskellDepends = [ base doctest Glob hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion monad-logger ]; description = "Add prefixes to your monad-logger output"; license = stdenv.lib.licenses.asl20; @@ -173281,8 +174481,8 @@ self: { }: mkDerivation { pname = "monad-metrics"; - version = "0.2.1.4"; - sha256 = "0h83kh1qc3wf9i0l8k998zib6fvf8fpwzn3qiz0d6z7az0i947cf"; + version = "0.2.2.0"; + sha256 = "13wsz9c02jsh5sh2kka1v7kna1aij51794n7g52ib27qmxgg9qvq"; libraryHaskellDepends = [ base clock ekg-core exceptions hashable microlens mtl text transformers unordered-containers @@ -179296,8 +180496,8 @@ self: { }: mkDerivation { pname = "nanovg-simple"; - version = "0.4.0.0"; - sha256 = "0k9sykyipj6gndkgk9j2l4r7a4kac851g077279a2j1k45dilcjn"; + version = "0.5.0.0"; + sha256 = "0z4gif0n56799llcm0l1p1d2qzxvfyrxvgzny58d8ymsgizldp6d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179915,6 +181115,38 @@ self: { broken = true; }) {}; + "neptune-backend" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, concurrent-extra, containers, deepseq, envy + , exceptions, hspec, http-api-data, http-client, http-client-tls + , http-media, http-types, iso8601-time, jwt, katip, lens + , lens-aeson, microlens, modern-uri, mtl, network, QuickCheck + , random, req, rio, safe-exceptions, semigroups, text, time + , transformers, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "neptune-backend"; + version = "0.1.2"; + sha256 = "0a7x9z584ckm20v2crpif56fyd0y3lr17b617wyd7ig1al51z3ri"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive + concurrent-extra containers deepseq envy exceptions http-api-data + http-client http-client-tls http-media http-types iso8601-time jwt + katip lens lens-aeson microlens modern-uri mtl network random req + rio safe-exceptions text time transformers unordered-containers + uuid vector + ]; + executableHaskellDepends = [ base mtl rio ]; + testHaskellDepends = [ + aeson base bytestring containers hspec iso8601-time mtl QuickCheck + semigroups text time transformers unordered-containers vector + ]; + description = "Neptune Client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nerf" = callPackage ({ mkDerivation, base, binary, bytestring, cmdargs, containers , crf-chain1, data-named, dawg, directory, filepath, IntervalMap @@ -181023,8 +182255,8 @@ self: { ({ mkDerivation, base, bytestring, network, text, time, vector }: mkDerivation { pname = "network-carbon"; - version = "1.0.14"; - sha256 = "1jrmda71gkcpppzv8s44kms4vz4zj7yb67wyr882s2b4hcf4il5b"; + version = "1.0.15"; + sha256 = "1w6a267h6svgx4wvbjy134wl2cvjdgicb0hcyrmb3z1d6bgy09dv"; libraryHaskellDepends = [ base bytestring network text time vector ]; @@ -182434,8 +183666,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.6.0.1"; - sha256 = "0xgnjriq9c3r9vpnkm0ldjqghss9ahjzk8ckrwq59bmdhns3fvx9"; + version = "0.6.1.1"; + sha256 = "1gqns0ifrmjd1013jfa9c03xwdmqicdvazjc9kkxyzw4mpjgjils"; libraryHaskellDepends = [ aeson array base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client http-types network @@ -182929,8 +184161,8 @@ self: { }: mkDerivation { pname = "nix-tree"; - version = "0.1.2.0"; - sha256 = "0indbvsjsl0m325f0vhzhllrhkq27agnbrmhzz7k0klprssf1hsn"; + version = "0.1.3.0"; + sha256 = "03ih8gz26rpkipd46zbrkpr9lp23q0nnq8ks6j80d32096n7q59i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -184701,16 +185933,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "numhask_0_7_0_0" = callPackage + "numhask_0_7_1_0" = callPackage ({ mkDerivation, base, bifunctors, doctest, mmorph, protolude , QuickCheck, random, text, transformers }: mkDerivation { pname = "numhask"; - version = "0.7.0.0"; - sha256 = "03rf8yk30kqbmq4jdvm3jnqdfx09nmki0kd7y9g2v7g07j2y1qx9"; - revision = "1"; - editedCabalFile = "1n1kilds4c98swbjrybl18d7z82bq4m56nlv03an7b9002wv8xn4"; + version = "0.7.1.0"; + sha256 = "1qkrmbz72zmmpn5mpqvz0k46b5yvkhwbiwkx8z06291xyz3qn9cx"; libraryHaskellDepends = [ base bifunctors mmorph protolude random text transformers ]; @@ -184830,15 +186060,16 @@ self: { "numhask-space" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive - , doctest, numhask, semigroupoids, tdigest, text, time + , doctest, numhask, random, semigroupoids, tdigest, text, time + , vector }: mkDerivation { pname = "numhask-space"; - version = "0.7.0.0"; - sha256 = "1vvm6px9wlqm07sc2p2df100x1pg2rgy363c59v1c910120lpdjd"; + version = "0.7.1.0"; + sha256 = "1wn4fi2778dxmqfimwx9favwd6v507vzpwms04w2bk5gn1fxgcdg"; libraryHaskellDepends = [ - adjunctions base containers distributive numhask semigroupoids - tdigest text time + adjunctions base containers distributive numhask random + semigroupoids tdigest text time vector ]; testHaskellDepends = [ base doctest numhask ]; description = "Numerical spaces"; @@ -186743,8 +187974,8 @@ self: { }: mkDerivation { pname = "openapi3"; - version = "3.0.0.1"; - sha256 = "12sa72v9iljq40r05ikcf336724v5cc3qznc30ba8b8bm4b29r8m"; + version = "3.0.1.0"; + sha256 = "03icxn4zbk6yasj6wca7qdg5cac5fadr4qcxyn4gblkffmqkb5lc"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -188453,14 +189684,16 @@ self: { "ordinal" = callPackage ({ mkDerivation, base, containers, data-default, hspec - , hspec-discover, QuickCheck, regex, template-haskell, text, vector + , hspec-discover, QuickCheck, regex, template-haskell, text, time + , vector }: mkDerivation { pname = "ordinal"; - version = "0.3.1.0"; - sha256 = "16y8a4xrrna6cwzy8lvvykdb9jgk5qswrwd8dn7iqgmhqck271x8"; + version = "0.4.0.0"; + sha256 = "1k0hpp5p546zlvwsy1d8hypryfwqvqdifmk3cqifw3xsdrqv3d8y"; libraryHaskellDepends = [ - base containers data-default regex template-haskell text vector + base containers data-default regex template-haskell text time + vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; testToolDepends = [ hspec-discover ]; @@ -189400,6 +190633,24 @@ self: { broken = true; }) {}; + "paddle" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , containers, HsOpenSSL, http-api-data, http-client, protolude + , scientific, servant, servant-client, servant-client-core, time + }: + mkDerivation { + pname = "paddle"; + version = "0.1.0.0"; + sha256 = "0j08q2a2hgh5wga114fmbcl5jn44cs6a6ajh1924l5akd0dvairc"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring containers HsOpenSSL + http-api-data http-client protolude scientific servant + servant-client servant-client-core time + ]; + description = "API to the Paddle payment processor"; + license = stdenv.lib.licenses.mit; + }) {}; + "pads-haskell" = callPackage ({ mkDerivation, base, byteorder, bytestring, containers, ghc-prim , haskell-src-meta, HUnit, mainland-pretty, mtl, mwc-random, parsec @@ -189694,8 +190945,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.11.2"; - sha256 = "10p2vmdjwgbzrbzrpsplbs67pycwz91aww4iz1rclw382xag42nb"; + version = "2.11.3.1"; + sha256 = "1qh81rninlhdynkjphbvfl78hp3kk9kjwr3bh3yvwkaip57gjmz9"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -189793,10 +191044,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.8.4"; - sha256 = "098xp2n6rmg2vhaip8yyvrr534cllb1s6kj9p6r4iqqv4w3nc2sb"; - revision = "1"; - editedCabalFile = "1p1gkq4sgyxnfnna1avjmbw4ifrsmw920qhnaa4nkmbpgmccdca2"; + version = "0.3.9.0"; + sha256 = "18hxvzrl4b9y3343nissbcxrl4g8x82yrinyir9ifgmpz5ikg248"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -189820,8 +191069,6 @@ self: { ]; description = "Pandoc filter for cross-references"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pandoc-csv2table" = callPackage @@ -189987,8 +191234,6 @@ self: { ]; description = "A Pandoc filter for including code from source files"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pandoc-japanese-filters" = callPackage @@ -190025,6 +191270,19 @@ self: { broken = true; }) {}; + "pandoc-link-context" = callPackage + ({ mkDerivation, base, containers, pandoc-types, relude, text }: + mkDerivation { + pname = "pandoc-link-context"; + version = "1.0.0.0"; + sha256 = "0pl232p0cdn810jyp3xjdhf3zfj6ryjmb1f462l4jivawffyjfd4"; + libraryHaskellDepends = [ + base containers pandoc-types relude text + ]; + description = "Extract \"contextual links\" from Pandoc"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pandoc-markdown-ghci-filter" = callPackage ({ mkDerivation, aeson, base, containers, ghcid, pandoc , pandoc-types, QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -190110,14 +191368,14 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "1.0.0.0"; - sha256 = "1vls3xvj8zijl6sd698f8jljqslm4jnk07v8vzlm0s2gab2lcgmj"; + version = "1.0.1.0"; + sha256 = "0p7sfsi70vbwkxwknl5k31qsvnkwvhdjr8c2q7y0pjz3xz9zdrjq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers data-default directory filepath hashable lifted-async lifted-base mtl pandoc pandoc-types shakespeare - tagsoup text typed-process yaml + tagsoup template-haskell text typed-process yaml ]; executableHaskellDepends = [ base containers directory filepath githash optparse-applicative @@ -190289,8 +191547,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.3.2"; - sha256 = "1dj07dnljy1b7m9sq5dlxvvl8rbla8cf129s2wcw24x31j3ga96b"; + version = "0.3.3"; + sha256 = "16jaq5q0b2q230iwhfhs2p1fmmqb38zssr7zbgjmry2045ya2dhh"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -191436,8 +192694,8 @@ self: { pname = "parsec"; version = "3.1.14.0"; sha256 = "132waj2cpn892midbhpkfmb74qq83v0zv29v885frlp1gvh94b67"; - revision = "1"; - editedCabalFile = "0dhg5xwqnig83hbkpawqi1k2prrps7jhkj4gb3ccram2drfmb933"; + revision = "2"; + editedCabalFile = "1xyjd06nns0k65k4ig2azrijy43gnbvpcfwb3jpd8vmn2fnk0yib"; libraryHaskellDepends = [ base bytestring mtl text ]; testHaskellDepends = [ base HUnit mtl test-framework test-framework-hunit @@ -192146,23 +193404,21 @@ self: { "password" = callPackage ({ mkDerivation, base, base-compat, base64, bytestring, Cabal , cabal-doctest, cryptonite, doctest, memory, QuickCheck - , quickcheck-instances, scrypt, tasty, tasty-quickcheck - , template-haskell, text + , quickcheck-instances, scrypt, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text }: mkDerivation { pname = "password"; - version = "2.0.1.1"; - sha256 = "1fi39w79p7jaw85i5r8f4flw7s1n2ljxj5ci9gda6a556015w1p8"; - revision = "1"; - editedCabalFile = "1r27scxmkmvw8nbcg4x3k10ibq4qhrmpwgnqbnz32g1fvw7mlxg3"; + version = "2.1.0.0"; + sha256 = "1v8hbjy0r6l0c6r0l4832z9whadx195fzxpn9l19zjb5ylz1zmqc"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base base64 bytestring cryptonite memory text + base base64 bytestring cryptonite memory template-haskell text ]; testHaskellDepends = [ base base-compat bytestring cryptonite doctest memory QuickCheck - quickcheck-instances scrypt tasty tasty-quickcheck template-haskell - text + quickcheck-instances scrypt tasty tasty-hunit tasty-quickcheck + template-haskell text ]; description = "Hashing and checking of passwords"; license = stdenv.lib.licenses.bsd3; @@ -192723,6 +193979,20 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "pava_0_1_1_0" = callPackage + ({ mkDerivation, base, criterion, hspec, mwc-random, vector }: + mkDerivation { + pname = "pava"; + version = "0.1.1.0"; + sha256 = "0zb5zp90ld4g2zlm11ns603q7jymx23n110vrm74f842xdxffkfs"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base hspec vector ]; + benchmarkHaskellDepends = [ base criterion mwc-random vector ]; + description = "Greatest convex majorants and least concave minorants"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "paymill" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -193119,6 +194389,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pcre2" = callPackage + ({ mkDerivation, base, containers, criterion, hspec + , microlens-platform, mtl, pcre-light, regex-pcre-builtin + , streaming, template-haskell, text + }: + mkDerivation { + pname = "pcre2"; + version = "1.1.2"; + sha256 = "1wpf87sm4r3q1aizxjb2ahvhw6kfy9x4ynlibqcfyjl1h5w3fffy"; + libraryHaskellDepends = [ + base containers mtl streaming template-haskell text + ]; + testHaskellDepends = [ + base containers hspec microlens-platform mtl streaming + template-haskell text + ]; + benchmarkHaskellDepends = [ + base containers criterion microlens-platform mtl pcre-light + regex-pcre-builtin streaming template-haskell text + ]; + description = "Regular expressions via the PCRE2 C library (included)"; + license = stdenv.lib.licenses.asl20; + }) {}; + "pdf-slave" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, directory, exceptions, haskintex, HaTeX @@ -194356,17 +195650,18 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent_2_11_0_1" = callPackage + "persistent_2_11_0_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, fast-logger, hspec , http-api-data, monad-logger, mtl, path-pieces, resource-pool - , resourcet, scientific, silently, text, time, transformers - , unliftio, unliftio-core, unordered-containers, vector + , resourcet, scientific, shakespeare, silently, text, time + , transformers, unliftio, unliftio-core, unordered-containers + , vector }: mkDerivation { pname = "persistent"; - version = "2.11.0.1"; - sha256 = "0nmgjk5jpsh7dxwyghvmnislxj8m77sdp9hg6anh7ba94xs7wcjv"; + version = "2.11.0.2"; + sha256 = "09dvwh9hdc50zr6yvbzp8a9n70yjqwa2kzvjm80l9m34p29v8kkc"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data monad-logger mtl @@ -194375,8 +195670,8 @@ self: { ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring - containers hspec http-api-data path-pieces scientific text time - transformers unordered-containers vector + containers hspec http-api-data path-pieces scientific shakespeare + text time transformers unordered-containers vector ]; description = "Type-safe, multi-backend data serialization"; license = stdenv.lib.licenses.mit; @@ -194611,6 +195906,31 @@ self: { broken = true; }) {}; + "persistent-mtl" = callPackage + ({ mkDerivation, base, bytestring, conduit, containers + , monad-logger, mtl, persistent, persistent-postgresql + , persistent-sqlite, persistent-template, resource-pool, resourcet + , resourcet-pool, tasty, tasty-golden, tasty-hunit, text + , transformers, unliftio, unliftio-core + }: + mkDerivation { + pname = "persistent-mtl"; + version = "0.2.0.0"; + sha256 = "0c22frczi2km3z108iz211gl023m69cjc284dwbknabsrl3yg4l5"; + libraryHaskellDepends = [ + base conduit containers mtl persistent resource-pool resourcet + resourcet-pool text transformers unliftio unliftio-core + ]; + testHaskellDepends = [ + base bytestring conduit containers monad-logger persistent + persistent-postgresql persistent-sqlite persistent-template + resource-pool resourcet tasty tasty-golden tasty-hunit text + unliftio + ]; + description = "Monad transformer for the persistent API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "persistent-mysql" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, fast-logger, hspec, HUnit, monad-logger, mysql @@ -194637,7 +195957,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "persistent-mysql_2_10_3" = callPackage + "persistent-mysql_2_10_3_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, fast-logger, hspec, HUnit, monad-logger, mysql , mysql-simple, persistent, persistent-qq, persistent-template @@ -194646,8 +195966,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.10.3"; - sha256 = "1da2vbkz55lngpi5ggndnnxv8gm9ckcv3gd3y8z47yh129b04csk"; + version = "2.10.3.1"; + sha256 = "00gs2ym5vw2cqahv48cx8fhi3kx06rn0s1pafm8pdlr98snvwif7"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text @@ -194781,7 +196101,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "persistent-postgresql_2_11_0_0" = callPackage + "persistent-postgresql_2_11_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring , conduit, containers, fast-logger, hspec, hspec-expectations , HUnit, monad-logger, mtl, persistent, persistent-qq @@ -194792,8 +196112,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.11.0.0"; - sha256 = "12h72dj6zmk8m45m62syc3inwvqgb03whymi7wds0aklzn4j83b4"; + version = "2.11.0.1"; + sha256 = "08bmf52fqjwzyw4dnvh2ql4q3ai05fzzicgd5z6bim13b9s4ggmk"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring conduit containers monad-logger mtl persistent postgresql-libpq postgresql-simple @@ -195888,8 +197208,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-plus"; - version = "0.1.0.0"; - sha256 = "1yzqrqkikkx6ii1n7zs5vf1k5m26v8bj8m0h43zmxb1j30klh2ir"; + version = "0.2.0.0"; + sha256 = "05xzmkzx3lc070ln6q2ynbqfh6rb70rx1n845gy0i59h6zpsl9ai"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base lists-flines ]; @@ -195935,8 +197255,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-common"; - version = "0.3.4.0"; - sha256 = "1cf2k35jljcbyzyfz85nsxjzh5wdiipm9sa558gky26yz1h3n54x"; + version = "0.4.0.0"; + sha256 = "02fc9cd1ad5m8qsi73zxzhz80g24q0brlhnxswzmmsxsmp4y2542"; libraryHaskellDepends = [ base phonetic-languages-permutations subG subG-instances vector ]; @@ -195949,27 +197269,27 @@ self: { , phonetic-languages-constraints, phonetic-languages-permutations , phonetic-languages-plus, phonetic-languages-rhythmicity , phonetic-languages-simplified-common - , phonetic-languages-simplified-properties-lists + , phonetic-languages-simplified-properties-lists-double , phonetic-languages-ukrainian, print-info, subG , ukrainian-phonetics-basic, uniqueness-periods-vector-filters , uniqueness-periods-vector-stats, vector }: mkDerivation { pname = "phonetic-languages-simplified-lists-examples"; - version = "0.4.0.0"; - sha256 = "18n45cz6x8lh8pphnipp24xjjf8j5h6kskmkr6x4l5y5qi13ld4x"; + version = "0.6.0.0"; + sha256 = "0y843gymz9wf7hmp8asxmd90rdlgxz2b1pgi27mpglr7xmhpfr34"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base heaps mmsyn2 phonetic-languages-constraints phonetic-languages-simplified-common - phonetic-languages-simplified-properties-lists vector + phonetic-languages-simplified-properties-lists-double vector ]; executableHaskellDepends = [ base heaps mmsyn2 parallel phonetic-languages-constraints phonetic-languages-permutations phonetic-languages-plus phonetic-languages-rhythmicity phonetic-languages-simplified-common - phonetic-languages-simplified-properties-lists + phonetic-languages-simplified-properties-lists-double phonetic-languages-ukrainian print-info subG ukrainian-phonetics-basic uniqueness-periods-vector-filters uniqueness-periods-vector-stats vector @@ -195996,6 +197316,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "phonetic-languages-simplified-properties-lists-double" = callPackage + ({ mkDerivation, base, phonetic-languages-rhythmicity + , phonetic-languages-simplified-common, ukrainian-phonetics-basic + , vector + }: + mkDerivation { + pname = "phonetic-languages-simplified-properties-lists-double"; + version = "0.1.0.0"; + sha256 = "1mx282gq9b2m718zrjjqxk1a17qdw5mdipmb818jr5ccrb81yhsl"; + libraryHaskellDepends = [ + base phonetic-languages-rhythmicity + phonetic-languages-simplified-common ukrainian-phonetics-basic + vector + ]; + description = "A generalization of the uniqueness-periods-vector-properties package"; + license = stdenv.lib.licenses.mit; + }) {}; + "phonetic-languages-ukrainian" = callPackage ({ mkDerivation, base, mmsyn2, mmsyn5, vector }: mkDerivation { @@ -196499,8 +197837,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.10.1.4"; - sha256 = "1kmkxcvkfqwp2p46s22gdnvk12g7bx9dqr8cs04wjw1rbj0mli49"; + version = "0.10.2.0"; + sha256 = "12hwfgqkn7sym9hig0b0afnzf0an6wcwdw9bc166y3539r3v13ck"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-client-tls http-types monad-logger mtl network profunctors random text time @@ -197771,8 +199109,8 @@ self: { }: mkDerivation { pname = "pipes-text"; - version = "0.0.2.5"; - sha256 = "0ahgkism9q5qda1iq45h9sc36vqyna017pf4kw28gzgbm01fx2a4"; + version = "1.0.0"; + sha256 = "0q01amm5813qpbkj9098mkd6h1a65vc864qjk2vgd4h80vx2a6mi"; libraryHaskellDepends = [ base bytestring pipes pipes-bytestring pipes-group pipes-parse pipes-safe streaming-commons text transformers @@ -199086,8 +200424,8 @@ self: { }: mkDerivation { pname = "pointfree"; - version = "1.1.1.6"; - sha256 = "1rsr9vgqq10ydwan2qvghgfvff5m75ivl8md8r8yxffbw0spiwsv"; + version = "1.1.1.7"; + sha256 = "19yvkh4akcsiy0blmrwy7ayirg729s3vs4w0qkb2w171aas34090"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199774,8 +201112,8 @@ self: { }: mkDerivation { pname = "polysemy-methodology"; - version = "0.1.7.0"; - sha256 = "1qb2rj2fc7vaf9i0lm9gqzkfy5a8zmsq9ibvhmc4457yd3k7cfcg"; + version = "0.1.8.0"; + sha256 = "0p4h6vjrq6g6pd27mqpzp33jg84gfi3wpymjkbxfrwz7ky74jag5"; libraryHaskellDepends = [ base co-log-polysemy polysemy polysemy-plugin polysemy-zoo ]; @@ -201643,8 +202981,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "postgresql-tx"; - version = "0.1.0.0"; - sha256 = "1jvrdyllmgd0v9w2wxqr1g70f6gza1wyb13j38ww2r2nvqzhp330"; + version = "0.3.0.0"; + sha256 = "1q8yh16wxgfdvr3090i395ba20lzv2iyq5sswrzm9slcbnan353d"; libraryHaskellDepends = [ base transformers ]; description = "A safe transaction monad for use with various PostgreSQL Haskell libraries"; license = stdenv.lib.licenses.bsd3; @@ -201654,25 +202992,27 @@ self: { ({ mkDerivation, base, monad-logger, postgresql-tx }: mkDerivation { pname = "postgresql-tx-monad-logger"; - version = "0.1.0.0"; - sha256 = "0y1x2d2r61ayhln0l2c5i3ivv97zpwyiaw1hymghpv4vwnlihv1y"; + version = "0.3.0.0"; + sha256 = "00gyhjfq13rknh4hpizmfizqv84b8l8ziik36gjyq1vsmfg5da43"; libraryHaskellDepends = [ base monad-logger postgresql-tx ]; description = "postgresql-tx interfacing for use with monad-logger"; license = stdenv.lib.licenses.bsd3; }) {}; "postgresql-tx-query" = callPackage - ({ mkDerivation, base, monad-logger, mtl, postgresql-query - , postgresql-simple, postgresql-tx, postgresql-tx-monad-logger - , transformers + ({ mkDerivation, base, exceptions, monad-control, monad-logger, mtl + , postgresql-query, postgresql-simple, postgresql-tx + , postgresql-tx-monad-logger, postgresql-tx-simple, transformers + , transformers-base }: mkDerivation { pname = "postgresql-tx-query"; - version = "0.1.0.0"; - sha256 = "0a7khw9ncc8k5cpi63kw598hvg3ycm1lchz46aw06pndcdzr54sv"; + version = "0.3.0.0"; + sha256 = "0d2i0djylqbmr4xd1hmxvcqv26xvlkkm0aflxzcz6b4vcb43b6lc"; libraryHaskellDepends = [ - base monad-logger mtl postgresql-query postgresql-simple - postgresql-tx postgresql-tx-monad-logger transformers + base exceptions monad-control monad-logger mtl postgresql-query + postgresql-simple postgresql-tx postgresql-tx-monad-logger + postgresql-tx-simple transformers transformers-base ]; description = "postgresql-tx interfacing for use with postgresql-query"; license = stdenv.lib.licenses.bsd3; @@ -201681,15 +203021,15 @@ self: { }) {}; "postgresql-tx-simple" = callPackage - ({ mkDerivation, base, postgresql-simple, postgresql-tx + ({ mkDerivation, base, bytestring, postgresql-simple, postgresql-tx , transformers }: mkDerivation { pname = "postgresql-tx-simple"; - version = "0.1.0.0"; - sha256 = "1k03wqqzsvmmd7wh9gnlg9h12v2xnzd1vc9396sl1krg29l8373p"; + version = "0.3.0.0"; + sha256 = "1n11n20yx60kkxccg59mmr1mz75p80r4q72kc2gmbkw26dn3al1z"; libraryHaskellDepends = [ - base postgresql-simple postgresql-tx transformers + base bytestring postgresql-simple postgresql-tx transformers ]; description = "postgresql-tx interfacing for use with postgresql-simple"; license = stdenv.lib.licenses.bsd3; @@ -201697,15 +203037,15 @@ self: { "postgresql-tx-squeal" = callPackage ({ mkDerivation, base, bytestring, generics-sop, postgresql-libpq - , postgresql-tx, records-sop, squeal-postgresql + , postgresql-tx, records-sop, squeal-postgresql, unliftio }: mkDerivation { pname = "postgresql-tx-squeal"; - version = "0.1.0.0"; - sha256 = "08wfdy6hlpwkv3njh33igskv489kk8zbsd1nk24fvql1w215gsa4"; + version = "0.3.0.0"; + sha256 = "1l0xjyjcwq0ndrc49alrp7ixs2dl1z4krdaclws8nf5pcpd03ap8"; libraryHaskellDepends = [ base bytestring generics-sop postgresql-libpq postgresql-tx - records-sop squeal-postgresql + records-sop squeal-postgresql unliftio ]; description = "postgresql-tx interfacing for use with squeal-postgresql"; license = stdenv.lib.licenses.bsd3; @@ -201713,6 +203053,21 @@ self: { broken = true; }) {}; + "postgresql-tx-squeal-compat-simple" = callPackage + ({ mkDerivation, base, postgresql-simple, postgresql-tx-squeal }: + mkDerivation { + pname = "postgresql-tx-squeal-compat-simple"; + version = "0.2.0.0"; + sha256 = "1n167zsslba4c8m91s26ir7gibb09gjx82q1r8l5ilxx10856a89"; + libraryHaskellDepends = [ + base postgresql-simple postgresql-tx-squeal + ]; + description = "Connection interop from postgresql-simple connections to postgresql-libpq connections"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "postgresql-typed" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring , containers, convertible, criterion, cryptonite, data-default @@ -203644,6 +204999,8 @@ self: { pname = "primitive"; version = "0.7.1.0"; sha256 = "1w53i4mk248g58xrffmksznr4nmn2bbbycajzpcqfxx5ybyyrsvb"; + revision = "1"; + editedCabalFile = "0nllkqvfrplhslfgbqgpn0r5k4mj5wlfixjxrpjz6vb73xwi5977"; libraryHaskellDepends = [ base deepseq transformers ]; testHaskellDepends = [ base base-orphans ghc-prim QuickCheck quickcheck-classes-base @@ -205135,18 +206492,19 @@ self: { "prolude" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, containers - , generic-random, mongoDB, mtl, persistent, persistent-mongoDB - , QuickCheck, quickcheck-instances, safe-exceptions, scientific - , swagger2, text, time, uuid, vector + , generic-random, lens, mongoDB, mtl, persistent + , persistent-mongoDB, QuickCheck, quickcheck-instances + , safe-exceptions, scientific, swagger2, text, time, uuid, vector }: mkDerivation { pname = "prolude"; - version = "0.0.0.12"; - sha256 = "09z9716pjyxzpqn3qc0zsi9mz03vf1qnb1q5bcf66bvb1kfj0phw"; + version = "0.0.0.13"; + sha256 = "1j4rq0libwrqs5f2ryfgpl5ayis7xlhl3ay2zbzqpwia39d38kcb"; libraryHaskellDepends = [ - aeson base bytestring cassava containers generic-random mongoDB mtl - persistent persistent-mongoDB QuickCheck quickcheck-instances - safe-exceptions scientific swagger2 text time uuid vector + aeson base bytestring cassava containers generic-random lens + mongoDB mtl persistent persistent-mongoDB QuickCheck + quickcheck-instances safe-exceptions scientific swagger2 text time + uuid vector ]; description = "ITProTV's custom prelude"; license = stdenv.lib.licenses.mit; @@ -208221,6 +209579,8 @@ self: { pname = "quantification"; version = "0.5.1"; sha256 = "1abr0rb3q13klrz6199gpl4d07s5y8j56i8gvpy8nqgyi7awznx9"; + revision = "1"; + editedCabalFile = "1q18l6wv57d0386p75ykkcpc18cdnzpbxdxbr5bdx02wj5v4vq8f"; libraryHaskellDepends = [ aeson base binary containers ghc-prim hashable path-pieces text unordered-containers vector @@ -209759,13 +211119,13 @@ self: { "raaz" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, criterion - , deepseq, hspec, hspec-discover, HUnit, optparse-applicative - , pretty, QuickCheck, transformers, vector + , criterion-measurement, deepseq, hspec, hspec-discover, HUnit + , optparse-applicative, pretty, QuickCheck, transformers, vector }: mkDerivation { pname = "raaz"; - version = "0.2.1"; - sha256 = "17wbnagrikmhkn4pgbwsj9n3k37xnq1a3j58280xikph2iy4mrcq"; + version = "0.2.2"; + sha256 = "1v7zyk61vk4d6xniqq4fglwccgpx9clx7hxp1xr531spshadq99p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring deepseq vector ]; @@ -209776,7 +211136,8 @@ self: { ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion pretty + base blaze-builder bytestring criterion criterion-measurement + pretty ]; description = "The raaz cryptographic library"; license = stdenv.lib.licenses.bsd3; @@ -211225,6 +212586,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ratelimiter" = callPackage + ({ mkDerivation, base, containers, extra, mtl, time, timespan + , vector + }: + mkDerivation { + pname = "ratelimiter"; + version = "0.1.0"; + sha256 = "00nx1zpyyhfviakhdvyys1m32jq45ryxyxisbyzp81mk1ddhq9qf"; + libraryHaskellDepends = [ + base containers extra mtl time timespan vector + ]; + testHaskellDepends = [ + base containers extra mtl time timespan vector + ]; + description = "In-memory rate limiter"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rating-chgk-info" = callPackage ({ mkDerivation, aeson, base-noprelude, bytestring, cassava , containers, directory, gauge, http-client, http-client-tls, iconv @@ -211331,32 +212710,24 @@ self: { }) {}; "rattletrap" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits - , bytestring, containers, filepath, http-client, http-client-tls + ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring + , caerbannog, containers, filepath, http-client, http-client-tls , HUnit, scientific, template-haskell, temporary, text , transformers }: mkDerivation { pname = "rattletrap"; - version = "9.2.0"; - sha256 = "0dyp5fmrrj4fv172hw1prdigpiaib0k3wn7lrngl1ql0gahvvzkr"; + version = "9.3.2"; + sha256 = "06mb7z1w56hvwl9gbkmbbib01760ix93x03bdl0ybpb6hhffq7r3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers + aeson aeson-pretty base binary bytestring caerbannog containers filepath http-client http-client-tls scientific template-haskell text transformers ]; - executableHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls scientific template-haskell - text transformers - ]; - testHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls HUnit scientific - template-haskell temporary text transformers - ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base bytestring filepath HUnit temporary ]; description = "Parse and generate Rocket League replays"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -216392,22 +217763,6 @@ self: { }: mkDerivation { pname = "replace-megaparsec"; - version = "1.4.3.0"; - sha256 = "0lngw78rzb5q4n2d55kap8czyjwylpayi3ywy4zkcacc6x9dril7"; - libraryHaskellDepends = [ - base bytestring megaparsec parser-combinators text - ]; - testHaskellDepends = [ base bytestring Cabal megaparsec text ]; - description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "replace-megaparsec_1_4_4_0" = callPackage - ({ mkDerivation, base, bytestring, Cabal, megaparsec - , parser-combinators, text - }: - mkDerivation { - pname = "replace-megaparsec"; version = "1.4.4.0"; sha256 = "1nlbs01ghm6gllkc7chv06hdrwlb94cipcwcx84wzasdqdzvcdl1"; libraryHaskellDepends = [ @@ -216416,7 +217771,6 @@ self: { testHaskellDepends = [ base bytestring Cabal megaparsec text ]; description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "replica" = callPackage @@ -216853,10 +218207,8 @@ self: { }: mkDerivation { pname = "reroute"; - version = "0.5.0.0"; - sha256 = "1wl7g4z37rwghckwpi34qgg5b3rdy9h1zyf8dcgrm6hdfaabp65r"; - revision = "2"; - editedCabalFile = "1lyrm0ca4a9312b26a5gsi1s9vr6b6vlizwblc49h33hviy78q1k"; + version = "0.6.0.0"; + sha256 = "1jvh5ngpf1w4y9b1ipx1c65q8gmwsajp8k5ha0sjn89hbc8cp48y"; libraryHaskellDepends = [ base deepseq hashable http-api-data hvect mtl text unordered-containers @@ -218095,8 +219447,8 @@ self: { }: mkDerivation { pname = "rhbzquery"; - version = "0.1.1"; - sha256 = "0nlh81cmkfsjgsmrrrcbf51vzmni1ddrhb8dzzxk9a8s76ybmcks"; + version = "0.4.1"; + sha256 = "0zfn9bzgm3wb2apnnnakh0lmys0nf9a2ch797m1sfsrbx2mjqvmh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -218105,7 +219457,7 @@ self: { ]; testHaskellDepends = [ base simple-cmd ]; description = "Bugzilla query tool"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.gpl2; }) {}; "rhine" = callPackage @@ -219006,8 +220358,8 @@ self: { }: mkDerivation { pname = "rob"; - version = "0.0.4"; - sha256 = "0ds0psp28fb5y21ycsxva1jqrbcvia94g3rk1b5p356php7zahsm"; + version = "0.0.5"; + sha256 = "0f3c4mv6h2cw51r2bw6xlg6aqkbpf2z8wi06pxvzc5ghn0s2k4n7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -221131,6 +222483,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "safe-json_1_1_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist + , generic-arbitrary, hashable, quickcheck-instances, scientific + , tasty, tasty-hunit, tasty-quickcheck, temporary, text, time + , unordered-containers, uuid, uuid-types, vector + }: + mkDerivation { + pname = "safe-json"; + version = "1.1.1.1"; + sha256 = "0wp955ak673jjcjwqmliwv3dk723kf0nl4rwvzqmlgfg9c57n2j3"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist hashable scientific tasty + tasty-hunit tasty-quickcheck text time unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + aeson base bytestring containers dlist generic-arbitrary hashable + quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck + temporary text time unordered-containers uuid uuid-types vector + ]; + description = "Automatic JSON format versioning"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safe-lazy-io" = callPackage ({ mkDerivation, base, extensible-exceptions, parallel, strict-io }: @@ -223719,34 +225096,51 @@ self: { }) {}; "scrapbook" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, data-default, drinkery - , extensible, feed, gitrev, req, rio, tasty, tasty-hunit - , xml-conduit, xml-types, yaml + ({ mkDerivation, base, drinkery, extensible, githash, rio + , scrapbook-core, tasty, tasty-hunit, yaml }: mkDerivation { pname = "scrapbook"; - version = "0.3.3"; - sha256 = "17xc7ljfxxwg4l2jiqf8ffwgwq3hq7lynf6p478jp0sxf54irjr1"; + version = "0.5.0"; + sha256 = "1jn3zhczi1m644c7b5flxph4sh4cdmix37xwj8zs0rghhmwnkhww"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty base data-default extensible feed req rio - xml-conduit xml-types yaml + base extensible rio scrapbook-core yaml ]; executableHaskellDepends = [ - aeson aeson-pretty base data-default drinkery extensible feed - gitrev req rio xml-conduit xml-types yaml + base drinkery extensible githash rio scrapbook-core yaml ]; testHaskellDepends = [ - aeson aeson-pretty base data-default extensible feed req rio tasty - tasty-hunit xml-conduit xml-types yaml + base extensible rio scrapbook-core tasty tasty-hunit yaml ]; - description = "Automatically derive Kotlin class to query servant webservices"; + description = "collect posts of site that is wrote in config yaml using feed or scraping"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; + "scrapbook-core" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, extensible, feed + , modern-uri, req, rio, tasty, tasty-hunit, xml-conduit, xml-types + , yaml + }: + mkDerivation { + pname = "scrapbook-core"; + version = "0.5.0"; + sha256 = "0j1andyk438babrnvxdhilk2l7f1y5qfk8s6r197xyf9893r5vv1"; + libraryHaskellDepends = [ + aeson aeson-pretty base extensible feed modern-uri req rio + xml-conduit xml-types yaml + ]; + testHaskellDepends = [ + aeson aeson-pretty base extensible feed modern-uri req rio tasty + tasty-hunit xml-conduit xml-types yaml + ]; + description = "Core Package for scrapbook"; + license = stdenv.lib.licenses.mit; + }) {}; + "scrape-changes" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, cron , directory, email-validate, filepath, hashable, hslogger @@ -225818,8 +227212,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, unix }: mkDerivation { pname = "serialport"; - version = "0.4.7"; - sha256 = "1z2drw7ighyws72wqms015n5hy0zxbrphdca7ldn34pz28122z07"; + version = "0.5.0"; + sha256 = "1w547rrfsa1cbjcdpqrlzwnnyrzd4lmbj52mnh98zz9aiv7rbqxv"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring HUnit ]; description = "Cross platform serial port library"; @@ -227530,8 +228924,8 @@ self: { }: mkDerivation { pname = "servant-polysemy"; - version = "0.1.0"; - sha256 = "1isk401bi31s8ldb14cw0bchr3lwjmm2aslrrl3hg21dsr0qfk4y"; + version = "0.1.1"; + sha256 = "074c1x51am3ffl9lzhq090h8a6xd9gjf154mhp51glb4m4f6kr15"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -228586,8 +229980,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.12.4"; - sha256 = "19ypfhzyqx23chxch847pkz11ida2a82n9rc0s7zfql83afssksi"; + version = "0.12.5"; + sha256 = "1p15nzwjbwbjxnqgs6dzz7sb2cp5y3l69hr3n10zmwmgrq4x2nfa"; libraryHaskellDepends = [ aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-client http-types iproute lens @@ -231603,6 +232997,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-cmd_0_2_3" = callPackage + ({ mkDerivation, base, directory, extra, filepath, process, unix }: + mkDerivation { + pname = "simple-cmd"; + version = "0.2.3"; + sha256 = "1r8rnv8zzp8jfvgrjls3zjdx235s9gh2kr3sv4w08dndq1rakxjv"; + libraryHaskellDepends = [ + base directory extra filepath process unix + ]; + description = "Simple String-based process commands"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-cmd-args" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -231877,12 +233285,12 @@ self: { }) {}; "simple-logger" = callPackage - ({ mkDerivation, base, fast-logger, mtl, text }: + ({ mkDerivation, base, fast-logger, monad-logger, mtl, text }: mkDerivation { pname = "simple-logger"; - version = "0.1.0"; - sha256 = "04qha59ymvxfigb0mpzi9ay297kfjv1i0jnsxxla6rk5imin2i58"; - libraryHaskellDepends = [ base fast-logger mtl text ]; + version = "0.1.1"; + sha256 = "16ap76da3pvigl9gwpzb6miy13z5ypgh318cnqfyij0l5hrg4qg4"; + libraryHaskellDepends = [ base fast-logger monad-logger mtl text ]; description = "A very simple but efficient logging framework"; license = stdenv.lib.licenses.mit; }) {}; @@ -233337,6 +234745,29 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "skylighting_0_10_2" = callPackage + ({ mkDerivation, base, binary, blaze-html, bytestring, containers + , directory, filepath, pretty-show, skylighting-core, text + }: + mkDerivation { + pname = "skylighting"; + version = "0.10.2"; + sha256 = "1f60fnr8d8a28fr785hjzaaakss1ncn0998sz740xb76wp6q7pqd"; + configureFlags = [ "-fexecutable" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers skylighting-core + ]; + executableHaskellDepends = [ + base blaze-html bytestring containers directory filepath + pretty-show text + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-core" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring @@ -233368,6 +234799,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "skylighting-core_0_10_2" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, criterion, Diff, directory + , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random, safe + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text + , transformers, utf8-string + }: + mkDerivation { + pname = "skylighting-core"; + version = "0.10.2"; + sha256 = "1igqskmcbhk7b3fv1a1fxvfc4s3mc2sf96q90bf5iipy0h3f2zbg"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath hxt mtl safe text transformers utf8-string + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath HUnit + pretty-show QuickCheck random tasty tasty-golden tasty-hunit + tasty-quickcheck text utf8-string + ]; + benchmarkHaskellDepends = [ + base containers criterion directory filepath text + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-extensions" = callPackage ({ mkDerivation, base, containers, skylighting, skylighting-modding , text @@ -233902,6 +235365,29 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "slynx_0_5_0_1" = callPackage + ({ mkDerivation, async, attoparsec, base, bytestring, containers + , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix + , monad-logger, mwc-random, optparse-applicative, statistics, text + , transformers, vector + }: + mkDerivation { + pname = "slynx"; + version = "0.5.0.1"; + sha256 = "013ck07xgna42a5vlk6a323z3x1jrggbjw7jr2ww8mpgvpw2wp8r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async attoparsec base bytestring containers elynx-markov elynx-seq + elynx-tools elynx-tree hmatrix monad-logger mwc-random + optparse-applicative statistics text transformers vector + ]; + executableHaskellDepends = [ base ]; + description = "Handle molecular sequences"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "small-bytearray-builder" = callPackage ({ mkDerivation, base, bytebuild, byteslice }: mkDerivation { @@ -236490,8 +237976,8 @@ self: { }: mkDerivation { pname = "socket-io"; - version = "1.3.11"; - sha256 = "078zbbhrpfb5a15vr2vjfxdyi1yabd07rg41ajvpcfqcwq4svw95"; + version = "1.3.12"; + sha256 = "01aqvbg498pdwi4wv14qsc6spd7nyaidmdz22azq746599f7xnrm"; libraryHaskellDepends = [ aeson attoparsec base bytestring engine-io mtl stm text transformers unordered-containers vector @@ -237632,6 +239118,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "spdx-license" = callPackage + ({ mkDerivation, base, containers, directory, hspec, megaparsec + , regex-tdfa, string-interpolate, text + }: + mkDerivation { + pname = "spdx-license"; + version = "0.1.0"; + sha256 = "17ksd29w4qv4vpk6wcah4xr15sjx1fcz7mcwqb6r7kqqmw7jqp7y"; + libraryHaskellDepends = [ + base containers megaparsec regex-tdfa string-interpolate text + ]; + testHaskellDepends = [ base directory hspec megaparsec text ]; + description = "SPDX license templates"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "spe" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -239360,10 +240862,8 @@ self: { }: mkDerivation { pname = "stack"; - version = "2.5.1"; - sha256 = "1ffbgs5wgdcvvwbg3pkpgih5dqcbw8mpjj2p49fd8f79cfxmjq20"; - revision = "1"; - editedCabalFile = "0k5hapiyq2qv8sn2l2j5sh6w9b8493apwwsbrhpym5m1llxrv29p"; + version = "2.5.1.1"; + sha256 = "0fdm4wc8hxawfab7dv2ayr853mna93gznb7g162gw4h4zxnyzwyc"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -241989,6 +243489,55 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "store_0_7_9" = callPackage + ({ mkDerivation, array, async, base, base-orphans + , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector + , clock, containers, contravariant, criterion, cryptohash, deepseq + , directory, filepath, free, ghc-prim, hashable, hspec + , hspec-smallcheck, integer-gmp, lifted-base, monad-control + , mono-traversable, nats, network, primitive, resourcet, safe + , smallcheck, store-core, syb, template-haskell, text, th-lift + , th-lift-instances, th-orphans, th-reify-many, th-utilities, time + , transformers, unordered-containers, vector + , vector-binary-instances, void, weigh + }: + mkDerivation { + pname = "store"; + version = "0.7.9"; + sha256 = "189ygrm1ycyyklh77a9vhdvw86gbhjba0kl8kj7z1b79sw8q4v4g"; + libraryHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant cryptohash deepseq directory + filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp + lifted-base monad-control mono-traversable nats network primitive + resourcet safe smallcheck store-core syb template-haskell text + th-lift th-lift-instances th-orphans th-reify-many th-utilities + time transformers unordered-containers vector void + ]; + testHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring clock containers contravariant cryptohash deepseq + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable nats network + primitive resourcet safe smallcheck store-core syb template-haskell + text th-lift th-lift-instances th-orphans th-reify-many + th-utilities time transformers unordered-containers vector void + ]; + benchmarkHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring cereal cereal-vector containers contravariant criterion + cryptohash deepseq directory filepath free ghc-prim hashable hspec + hspec-smallcheck integer-gmp lifted-base monad-control + mono-traversable nats network primitive resourcet safe smallcheck + store-core syb template-haskell text th-lift th-lift-instances + th-orphans th-reify-many th-utilities time transformers + unordered-containers vector vector-binary-instances void weigh + ]; + description = "Fast binary serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "store-core" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, primitive, text , transformers @@ -243080,8 +244629,8 @@ self: { }: mkDerivation { pname = "strict"; - version = "0.4"; - sha256 = "0gs5fqsrwsc3y5w6fp91p9frgh7h42kd9smyg04cw284d5wfx7r7"; + version = "0.4.0.1"; + sha256 = "0hb24a09c3agsq7sdv8r2b2jc2f4g1blg2xvj4cfadynib0apxnz"; libraryHaskellDepends = [ assoc base binary bytestring deepseq ghc-prim hashable text these transformers @@ -243740,6 +245289,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stripe-hs" = callPackage + ({ mkDerivation, aeson, base, bytestring, casing, cpphs, cryptonite + , hspec, http-client, http-client-tls, memory, safe, servant + , servant-client, stripe-servant, text, time, vector + }: + mkDerivation { + pname = "stripe-hs"; + version = "0.1.0.0"; + sha256 = "1zfs0cwcylzv8ski3chprn5f85cfgjsdclngzmabwqww0ijrl806"; + libraryHaskellDepends = [ + aeson base bytestring casing cpphs cryptonite http-client memory + safe servant servant-client stripe-servant text time + ]; + testHaskellDepends = [ + aeson base bytestring casing cpphs cryptonite hspec http-client + http-client-tls memory safe servant servant-client stripe-servant + text time vector + ]; + description = "Unofficial Stripe client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stripe-http-client" = callPackage ({ mkDerivation, aeson, base, bytestring, free, hspec, http-client , http-client-tls, http-types, stripe-core, stripe-tests, text @@ -243799,6 +245370,22 @@ self: { broken = true; }) {}; + "stripe-servant" = callPackage + ({ mkDerivation, aeson, base, casing, http-api-data, servant, text + , time, unordered-containers, vector + }: + mkDerivation { + pname = "stripe-servant"; + version = "0.1.0.0"; + sha256 = "05l07x8k0dd81yxq1m0j7h7kvpplr3f69yxl1f9sx9z9cdqjxspa"; + libraryHaskellDepends = [ + aeson base casing http-api-data servant text time + unordered-containers vector + ]; + description = "Unofficial Stripe servant types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stripe-signature" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite , memory, stripe-concepts, text @@ -244044,6 +245631,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "structured-cli_2_7_0_1" = callPackage + ({ mkDerivation, base, data-default, exceptions, haskeline, mtl + , split, transformers + }: + mkDerivation { + pname = "structured-cli"; + version = "2.7.0.1"; + sha256 = "18l4jy328djmrwhmcmli73592qlld85fwbwby95mghwdbdy2i68g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base data-default exceptions haskeline mtl split transformers + ]; + executableHaskellDepends = [ base data-default mtl split ]; + description = "Application library for building interactive console CLIs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "structured-haskell-mode" = callPackage ({ mkDerivation, base, descriptive, ghc-prim, haskell-src-exts , text @@ -247398,8 +249004,8 @@ self: { }: mkDerivation { pname = "table-layout"; - version = "0.9.0.1"; - sha256 = "09lj27z5jnnzj0piyr9g3g76j4i0wcmvz65zk839ssaqymmnl9cg"; + version = "0.9.1.0"; + sha256 = "0jg6hr835r8m7vn92a01y754ssby3qkkai8sr42bwjvqn7zy7xl8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -247602,8 +249208,6 @@ self: { executablePkgconfigDepends = [ gtk3 ]; description = "A desktop bar similar to xmobar, but with more GUI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3;}; "tag-bits" = callPackage @@ -248649,18 +250253,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty_1_4" = callPackage - ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl + "tasty_1_4_0_1" = callPackage + ({ mkDerivation, ansi-terminal, base, clock, containers, mtl , optparse-applicative, stm, tagged, unbounded-delays, unix , wcwidth }: mkDerivation { pname = "tasty"; - version = "1.4"; - sha256 = "0jkia4zg01936gm2klpn3c4grlmdgiq0qnqq1cz7xg4baza14q3b"; + version = "1.4.0.1"; + sha256 = "1ffq2gpasdqm2drhd2aglcq33yrpb1h3grfyqyc34amz65bfczqq"; libraryHaskellDepends = [ - ansi-terminal async base clock containers mtl optparse-applicative - stm tagged unbounded-delays unix wcwidth + ansi-terminal base clock containers mtl optparse-applicative stm + tagged unbounded-delays unix wcwidth ]; description = "Modern and extensible testing framework"; license = stdenv.lib.licenses.mit; @@ -248892,8 +250496,8 @@ self: { pname = "tasty-hedgehog"; version = "1.0.0.2"; sha256 = "1vsv3m6brhshpqm8qixz97m7h0nx67cj6ira4cngbk7mf5rqylv5"; - revision = "4"; - editedCabalFile = "0z47ssv9030px81sxivhw5jp7yfpr6r6anlf03slks31jkzvx4gl"; + revision = "6"; + editedCabalFile = "12s7jgz14j32h62mgs4qbypqlpwjly1bk2hgrwqi9w3cjsskqk88"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -248971,6 +250575,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-hunit_0_10_0_3" = callPackage + ({ mkDerivation, base, call-stack, tasty }: + mkDerivation { + pname = "tasty-hunit"; + version = "0.10.0.3"; + sha256 = "0gz6zz3w7s44pymw33xcxnawryl27zk33766sab96nz2xh91kvxp"; + libraryHaskellDepends = [ base call-stack tasty ]; + description = "HUnit support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-hunit-adapter" = callPackage ({ mkDerivation, base, HUnit, tasty, tasty-hunit }: mkDerivation { @@ -248993,6 +250609,18 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "tasty-hunit-compat_0_2_0_1" = callPackage + ({ mkDerivation, base, HUnit, tasty, tasty-hunit }: + mkDerivation { + pname = "tasty-hunit-compat"; + version = "0.2.0.1"; + sha256 = "0kfxga9j1iy7f00gj3dsh45ywyi7qzdlrmp16gr4ir3b08rwhj2m"; + libraryHaskellDepends = [ base HUnit tasty tasty-hunit ]; + description = "Integration of `HUnit` with `tasty`"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-integrate" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, containers , deepseq, directory, either, haskell-src-exts @@ -249201,6 +250829,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-quickcheck_0_10_1_2" = callPackage + ({ mkDerivation, base, optparse-applicative, pcre-light, QuickCheck + , random, tagged, tasty, tasty-hunit + }: + mkDerivation { + pname = "tasty-quickcheck"; + version = "0.10.1.2"; + sha256 = "0i1i78587znqzwps49milyr5n2k388ld2kr9ysz1vw8gcw51qq49"; + libraryHaskellDepends = [ + base optparse-applicative QuickCheck random tagged tasty + ]; + testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; + description = "QuickCheck support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-quickcheck-laws" = callPackage ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck }: mkDerivation { @@ -249242,6 +250887,8 @@ self: { pname = "tasty-silver"; version = "3.1.15"; sha256 = "07iiaw5q5jb6bxm5ys1s6bliw0qxsqp100awzxwkwfia03i1iz8z"; + revision = "1"; + editedCabalFile = "1pxwixy274w0z99zsx0aywcxcajnpgan3qri81mr1wb6afxrq8d6"; libraryHaskellDepends = [ ansi-terminal async base bytestring containers deepseq directory filepath mtl optparse-applicative process process-extras regex-tdfa @@ -249255,6 +250902,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-silver_3_2_1" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , deepseq, directory, filepath, mtl, optparse-applicative, process + , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit + , temporary, text, transformers + }: + mkDerivation { + pname = "tasty-silver"; + version = "3.2.1"; + sha256 = "1i39xks5rjpnid2y1n16fyb01wj7hpdw0n5ci1rnsps5f16nkcxr"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring containers deepseq directory + filepath mtl optparse-applicative process process-extras regex-tdfa + stm tagged tasty temporary text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary + transformers + ]; + description = "A fancy test runner, including support for golden tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-smallcheck" = callPackage ({ mkDerivation, async, base, smallcheck, tagged, tasty }: mkDerivation { @@ -249266,6 +250937,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-smallcheck_0_8_2" = callPackage + ({ mkDerivation, base, optparse-applicative, smallcheck, tagged + , tasty + }: + mkDerivation { + pname = "tasty-smallcheck"; + version = "0.8.2"; + sha256 = "0csgwn3vch0jnpqyyfnrfjq4z0dpl67imh5a7byll3hhlyidgjym"; + libraryHaskellDepends = [ + base optparse-applicative smallcheck tagged tasty + ]; + description = "SmallCheck support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-stats" = callPackage ({ mkDerivation, base, containers, directory, process, stm, tagged , tasty, time @@ -249821,6 +251508,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "techlab" = callPackage + ({ mkDerivation, base, chassis, co-log-polysemy, composite-base + , containers, dhall, formatting, optics, path-dhall-instance + , polysemy, polysemy-extra, polysemy-fs, polysemy-methodology + , polysemy-methodology-composite, polysemy-plugin, polysemy-vinyl + , polysemy-zoo + }: + mkDerivation { + pname = "techlab"; + version = "0.1.1.0"; + sha256 = "1139slr5pd03zr7w6m3mw625wkfd9jw8slqddgmbawpbi2z20p80"; + libraryHaskellDepends = [ + base chassis co-log-polysemy composite-base containers dhall + formatting optics path-dhall-instance polysemy polysemy-extra + polysemy-fs polysemy-methodology polysemy-methodology-composite + polysemy-plugin polysemy-vinyl polysemy-zoo + ]; + description = "Bleeding edge prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "technique" = callPackage ({ mkDerivation, async, base, containers, core-data, core-program , core-text, dlist, free, hashable, hspec, ivar-simple, megaparsec @@ -251683,8 +253393,8 @@ self: { }: mkDerivation { pname = "testcontainers"; - version = "0.2.0.0"; - sha256 = "0drdi2qqgiw499lwvkdc5yn8x7mys6l4p47jcz0af62fczpa5dnh"; + version = "0.3.0.0"; + sha256 = "0iibmfb5ps7i9d35pwj22a8dxn6b31hmdzswcdmbhdbkq06534hj"; libraryHaskellDepends = [ aeson aeson-optics base bytestring exceptions mtl network optics-core process resourcet tasty text unliftio-core @@ -253000,8 +254710,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "th-abstraction"; - version = "0.4.0.0"; - sha256 = "09r09va7ihhk2nbz73y0cp4hijbf4zpr4hiss0xqa9pqkkazz62h"; + version = "0.4.1.0"; + sha256 = "1klza7zxcr8bgyflndwv0wgziy0snjh1w2c5z3mv17yra0yrs84f"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -254690,14 +256400,14 @@ self: { broken = true; }) {}; - "time_1_11_1" = callPackage + "time_1_11_1_1" = callPackage ({ mkDerivation, base, criterion, deepseq, QuickCheck, random , tasty, tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.11.1"; - sha256 = "0l0nqqg38xz2q78pi4i4jsbrb1jkn9ch0xlq17kn7824dh0j21vw"; + version = "1.11.1.1"; + sha256 = "0xrs9j4fskxz98zgwhgh7w4d9a6im3ipahg6ahp0689qhs61cx9p"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -254730,23 +256440,6 @@ self: { }: mkDerivation { pname = "time-compat"; - version = "1.9.4"; - sha256 = "0fpk2bpxfyzwd24lk06k3cpra713hrpva5ylnwa28zq34azy1snz"; - libraryHaskellDepends = [ base base-orphans deepseq time ]; - testHaskellDepends = [ - base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit - tasty-quickcheck time - ]; - description = "Compatibility package for time"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "time-compat_1_9_5" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, deepseq, HUnit - , QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck, time - }: - mkDerivation { - pname = "time-compat"; version = "1.9.5"; sha256 = "19p3056i6kh8lgcdsnwsh8pj80xyi23kmw9n7hmdacczs5kv49ii"; libraryHaskellDepends = [ base base-orphans deepseq time ]; @@ -254756,7 +256449,6 @@ self: { ]; description = "Compatibility package for time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-extras" = callPackage @@ -256063,6 +257755,29 @@ self: { license = stdenv.lib.licenses.gpl3Plus; }) {}; + "tlynx_0_5_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad + , containers, elynx-tools, elynx-tree, gnuplot, lifted-async + , monad-logger, mwc-random, optparse-applicative, parallel + , statistics, text, transformers, vector + }: + mkDerivation { + pname = "tlynx"; + version = "0.5.0.1"; + sha256 = "0prqnbq75jrixx845z3hbqajfc63vgsdfdgrsxw0g29rx0x4hw2i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring comonad containers elynx-tools + elynx-tree gnuplot lifted-async monad-logger mwc-random + optparse-applicative parallel statistics text transformers vector + ]; + executableHaskellDepends = [ base ]; + description = "Handle phylogenetic trees"; + license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tmapchan" = callPackage ({ mkDerivation, base, containers, hashable, stm , unordered-containers @@ -261477,8 +263192,8 @@ self: { }: mkDerivation { pname = "typed-encoding"; - version = "0.5.1.0"; - sha256 = "0bycjpq11p1byg5kncj3zykf2k5j18mgz3c9jsmcwji4wslagacp"; + version = "0.5.2.1"; + sha256 = "1n71rxj42ssv7g4yqsycg5wg1afja2y1jxfb5khv323v581gf4wn"; libraryHaskellDepends = [ base base64-bytestring bytestring symbols text ]; @@ -261879,8 +263594,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.7.10.1"; - sha256 = "0zq0bl4j1hwf2q0ipl0vp0q19lhs0bnwmrh7qh1qn53g078aj5ga"; + version = "0.7.11.1"; + sha256 = "1kbxj35dr41rg1s38f9dv2bg2d0rrwj1g2154ggfpx6kwy758jg6"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -262553,13 +264268,24 @@ self: { ({ mkDerivation, base, bytestring, mmsyn2, mmsyn5, vector }: mkDerivation { pname = "ukrainian-phonetics-basic"; - version = "0.3.2.0"; - sha256 = "16w4dggl61jh93rqq0czb3lpbq9cf4kxih5c0i5mbrjcxn50cdqg"; + version = "0.4.1.0"; + sha256 = "1sgch686yq6yqm6yz63v4hcprslfzn82an1ndxbgy0m7d7ipdavx"; libraryHaskellDepends = [ base bytestring mmsyn2 mmsyn5 vector ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = stdenv.lib.licenses.mit; }) {}; + "ukrainian-phonetics-basic-array" = callPackage + ({ mkDerivation, base, bytestring, mmsyn2-array, mmsyn5 }: + mkDerivation { + pname = "ukrainian-phonetics-basic-array"; + version = "0.1.1.0"; + sha256 = "1v5nzcnyrkhz5r2igxdp07ac506p0nnmjiskxxil5rzhab9zf8kn"; + libraryHaskellDepends = [ base bytestring mmsyn2-array mmsyn5 ]; + description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; + license = stdenv.lib.licenses.mit; + }) {}; + "ulid" = callPackage ({ mkDerivation, base, binary, bytestring, crypto-api, deepseq , format-numbers, hashable, hspec, random, text, time @@ -263671,8 +265397,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "uniqueness-periods-vector-stats"; - version = "0.1.2.0"; - sha256 = "1k98rdjq4i38lrnradfpdzk25b312h65m4mzbyjjzn7hzfra86gn"; + version = "0.2.1.0"; + sha256 = "1vw12a6q1h2in2llyy49n54s20sh8i4ry9vr2rwy8q0xfvfq9v25"; libraryHaskellDepends = [ base ghc-prim ]; description = "A very basic descriptive statistics"; license = stdenv.lib.licenses.mit; @@ -265026,8 +266752,8 @@ self: { }: mkDerivation { pname = "uri-bytestring"; - version = "0.3.2.2"; - sha256 = "0spzv3mwlpxiamd7347sxwcy2xri16ak1y7p1v4fisnvq4jprm67"; + version = "0.3.3.0"; + sha256 = "1zpynqz2q29cfk77n0d6lrnzmrqqi5nijvqd2pkz2fax3s6qhysz"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring containers template-haskell th-lift-instances @@ -267389,8 +269115,8 @@ self: { }: mkDerivation { pname = "vector-algorithms"; - version = "0.8.0.3"; - sha256 = "11vks2h9f5gk0irsx5j9xwlicbzkv3k80sx76j5k3zb38q0izi0s"; + version = "0.8.0.4"; + sha256 = "0fxg6w0vh5g2vzw4alajj9ywdijfn9nyx28hbckhmwwbfxb6l5vn"; libraryHaskellDepends = [ base bytestring primitive vector ]; testHaskellDepends = [ base bytestring containers QuickCheck vector @@ -267492,16 +269218,17 @@ self: { }) {}; "vector-circular" = callPackage - ({ mkDerivation, base, hedgehog, hedgehog-classes, nonempty-vector - , primitive, semigroupoids, template-haskell, vector + ({ mkDerivation, base, deepseq, hedgehog, hedgehog-classes + , nonempty-vector, primitive, semigroupoids, template-haskell + , vector }: mkDerivation { pname = "vector-circular"; - version = "0.1"; - sha256 = "1ha5hdl2g7shjssjhqx4s5sqp34y301l0f0dg8yshrw5srg1k90x"; + version = "0.1.1"; + sha256 = "08ydvvhzgkci615dnh3r5avzvx0xzibh9l2lys93sbxa139j446c"; libraryHaskellDepends = [ - base nonempty-vector primitive semigroupoids template-haskell - vector + base deepseq nonempty-vector primitive semigroupoids + template-haskell vector ]; testHaskellDepends = [ base hedgehog hedgehog-classes ]; description = "circular vectors"; @@ -267741,14 +269468,32 @@ self: { }: mkDerivation { pname = "vector-sized"; - version = "1.4.2"; - sha256 = "02a7jzik6a6w1xb6bwpvl6hmii6jgi9wr0q7p48bfbq0mlqjv42h"; + version = "1.4.3"; + sha256 = "0k1rvy6znp2kig5v7w7zpq9i3sz65prp1wcpmjqgzkz3qb0s5l00"; + libraryHaskellDepends = [ + adjunctions base binary comonad deepseq distributive + finite-typelits hashable indexed-list-literals primitive vector + ]; + description = "Size tagged vectors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "vector-sized_1_4_3_1" = callPackage + ({ mkDerivation, adjunctions, base, binary, comonad, deepseq + , distributive, finite-typelits, hashable, indexed-list-literals + , primitive, vector + }: + mkDerivation { + pname = "vector-sized"; + version = "1.4.3.1"; + sha256 = "0vm6wvbn3g4r028p46yh24rz7pr429w03jshpwyj2z2c6b058klr"; libraryHaskellDepends = [ adjunctions base binary comonad deepseq distributive finite-typelits hashable indexed-list-literals primitive vector ]; description = "Size tagged vectors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-space" = callPackage @@ -268598,6 +270343,17 @@ self: { broken = true; }) {}; + "vinyl-loeb" = callPackage + ({ mkDerivation, base, vinyl }: + mkDerivation { + pname = "vinyl-loeb"; + version = "0.0.1.0"; + sha256 = "1vxw57c17lajq6qb2kcblymbg42y7ddh85kiik5kwmbxgfmqyrrv"; + libraryHaskellDepends = [ base vinyl ]; + description = "Loeb's theorem for extensible records"; + license = stdenv.lib.licenses.mit; + }) {}; + "vinyl-named-sugar" = callPackage ({ mkDerivation, base, vinyl }: mkDerivation { @@ -268822,19 +270578,20 @@ self: { }) {}; "vivid" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, directory - , filepath, hashable, MonadRandom, mtl, network, process, random - , random-shuffle, split, stm, time, transformers, utf8-string - , vivid-osc, vivid-supercollider + ({ mkDerivation, base, binary, bytestring, cereal, containers + , directory, filepath, hashable, MonadRandom, mtl, network, process + , random, random-shuffle, split, stm, time, transformers + , utf8-string, vivid-osc, vivid-supercollider }: mkDerivation { pname = "vivid"; - version = "0.4.2.4"; - sha256 = "11admh79xx88i0yv8x7b38cchgarjbrxmzcbyd2aqa5v7hvk22k6"; + version = "0.5.1.0"; + sha256 = "06skwy5k4sgmh7m20m5v3g82kvm6sxq2sxmg039s45pvkbfp1c32"; libraryHaskellDepends = [ - base binary bytestring containers directory filepath hashable - MonadRandom mtl network process random random-shuffle split stm - time transformers utf8-string vivid-osc vivid-supercollider + base binary bytestring cereal containers directory filepath + hashable MonadRandom mtl network process random random-shuffle + split stm time transformers utf8-string vivid-osc + vivid-supercollider ]; description = "Sound synthesis with SuperCollider"; license = "GPL"; @@ -269208,8 +270965,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.8"; - sha256 = "08d48q6wml8bh28s39zk12hi6760xmn92qdb9zk7y3h896i8v15s"; + version = "3.8.2"; + sha256 = "1wq3hd99zqzasfj4w86yypcd0yrdp8q3xrzx3g2v6vyi99qwzdrr"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -269640,8 +271397,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.1.3"; - sha256 = "17s8cf0fdbkg9z2pvpsbhxg2cy5yy3c94513gkgf81lfl38zdrn7"; + version = "3.1.4.1"; + sha256 = "0q95vz3x0avznpv0mcb71vlmamyws8sm50asrhcph5qwfwh9x13a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -272809,8 +274566,8 @@ self: { }: mkDerivation { pname = "websockets"; - version = "0.12.7.1"; - sha256 = "1jqlvgw1ffw0236y4g7li188m9ac37a2yp07vkvcmbz63rmhfmnk"; + version = "0.12.7.2"; + sha256 = "1b92a41l2var1ccg350mh2bjmb2plb6d79yzvmlwkd41nifmmi44"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -272974,8 +274731,8 @@ self: { }: mkDerivation { pname = "weeder"; - version = "2.1.2"; - sha256 = "0jhdpv4032334ag46jm6d6nc3pdkccq74fkfzijslz798zh9sqmj"; + version = "2.1.3"; + sha256 = "0yph2dzg4xrfs7439jmxn3jc7h42id0c2f987wl6lccrbn39vzd7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -273735,8 +275492,8 @@ self: { }: mkDerivation { pname = "witch"; - version = "0.0.0.3"; - sha256 = "0ghajh4f4xfhn79bmyhamxjgl63lwg37kp39nn1q6qxggzzmzkyx"; + version = "0.0.0.4"; + sha256 = "1mph0zaz2dnhpchyiyspqsjghd8kn8sbqnhbyjmag51l2wr418vb"; libraryHaskellDepends = [ base bytestring containers text ]; testHaskellDepends = [ base bytestring containers hspec QuickCheck text @@ -279805,8 +281562,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.6.1.5"; - sha256 = "1awd16wli7g746sf5aqkzb0nglcbji3pl5yyximhb2ab2gjl2ank"; + version = "0.6.1.7"; + sha256 = "11z4zgzj9j15agnqj9dpfavmi2ns9d6aa4inazk1kig1wai2inp1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -280041,6 +281798,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_6_18_8" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, bytestring, case-insensitive, cereal, clientsession + , conduit, conduit-extra, containers, cookie, deepseq, fast-logger + , gauge, hspec, hspec-expectations, http-types, HUnit, memory + , monad-logger, mtl, network, parsec, path-pieces, primitive + , random, resourcet, shakespeare, streaming-commons + , template-haskell, text, time, transformers, unix-compat, unliftio + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.18.8"; + sha256 = "1phqb74z5nqnx1xnbhnpimcdcrzm5dd474svzc5hp0ji3kp2xkri"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq fast-logger http-types memory + monad-logger mtl parsec path-pieces primitive random resourcet + shakespeare template-haskell text time transformers unix-compat + unliftio unordered-containers vector wai wai-extra wai-logger warp + word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces random resourcet shakespeare streaming-commons + template-haskell text transformers unliftio wai wai-extra warp + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text + ]; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -280386,8 +282181,8 @@ self: { }: mkDerivation { pname = "yesod-form-multi"; - version = "1.6.0"; - sha256 = "162pyvyv5kv5bicl8ikvffnsyjqc8z0n758ycgnvwly0bvskrl37"; + version = "1.7.0"; + sha256 = "02xba6x59sx8c72vazbl5jhjkxgni6h3bkvidr4hvqrx2bscmk45"; libraryHaskellDepends = [ base containers network-uri shakespeare text transformers yesod-core yesod-form @@ -281268,6 +283063,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-test_1_6_12" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , bytestring, case-insensitive, conduit, containers, cookie, hspec + , hspec-core, html-conduit, http-types, HUnit, memory, mtl, network + , pretty-show, text, time, transformers, unliftio, unliftio-core + , wai, wai-extra, xml-conduit, xml-types, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.6.12"; + sha256 = "1xgy7dzhqjgllqcpyyxs0spdg6vlz2c1sjvni7w7qnsf0ckyw2l8"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html bytestring + case-insensitive conduit containers cookie hspec-core html-conduit + http-types HUnit memory mtl network pretty-show text time + transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers cookie hspec html-conduit http-types + HUnit text unliftio unliftio-core wai wai-extra xml-conduit + yesod-core yesod-form + ]; + description = "integration testing for WAI/Yesod Applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-test-json" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, hspec , http-types, HUnit, text, transformers, wai, wai-test @@ -282660,20 +284482,19 @@ self: { "zeolite-lang" = callPackage ({ mkDerivation, base, containers, directory, filepath, hashable - , mtl, parsec, regex-tdfa, time, transformers, unix + , megaparsec, mtl, parser-combinators, regex-tdfa, time + , transformers, unix }: mkDerivation { pname = "zeolite-lang"; - version = "0.9.0.0"; - sha256 = "0gcjjxavsc763a218rswzk7zrx917qg5sid7gpy81yw054kfp6ws"; - revision = "1"; - editedCabalFile = "0c76xxaxqwsh0ybvf5r6wza9gq7y7hiqm75pazmrhkzvm48q1dl8"; + version = "0.12.0.0"; + sha256 = "056brd93d1559wdz7s4wcvjglqg5p1bafhhgbqcqnd0q8msnilrv"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base containers directory filepath hashable mtl parsec regex-tdfa - time transformers unix + base containers directory filepath hashable megaparsec mtl + parser-combinators regex-tdfa time transformers unix ]; executableHaskellDepends = [ base containers directory filepath unix diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 6bcc563164eb5..964c179fb65b0 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -414,13 +414,13 @@ rec { */ generateOptparseApplicativeCompletion = exeName: pkg: overrideCabal pkg (drv: { postInstall = (drv.postInstall or "") + '' - bashCompDir="$out/share/bash-completion/completions" - zshCompDir="$out/share/zsh/vendor-completions" - fishCompDir="$out/share/fish/vendor_completions.d" + bashCompDir="''${!outputBin}/share/bash-completion/completions" + zshCompDir="''${!outputBin}/share/zsh/vendor-completions" + fishCompDir="''${!outputBin}/share/fish/vendor_completions.d" mkdir -p "$bashCompDir" "$zshCompDir" "$fishCompDir" - "$out/bin/${exeName}" --bash-completion-script "$out/bin/${exeName}" >"$bashCompDir/${exeName}" - "$out/bin/${exeName}" --zsh-completion-script "$out/bin/${exeName}" >"$zshCompDir/_${exeName}" - "$out/bin/${exeName}" --fish-completion-script "$out/bin/${exeName}" >"$fishCompDir/${exeName}.fish" + "''${!outputBin}/bin/${exeName}" --bash-completion-script "''${!outputBin}/bin/${exeName}" >"$bashCompDir/${exeName}" + "''${!outputBin}/bin/${exeName}" --zsh-completion-script "''${!outputBin}/bin/${exeName}" >"$zshCompDir/_${exeName}" + "''${!outputBin}/bin/${exeName}" --fish-completion-script "''${!outputBin}/bin/${exeName}" >"$fishCompDir/${exeName}.fish" # Sanity check grep -F ${exeName} <$bashCompDir/${exeName} >/dev/null || { diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 30f00cc6ea2cc..fe7fad15ce37b 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -19,9 +19,10 @@ self: super: { # HLS and its fork of ghcide that it uses # both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { }; - hls-brittany = self.callPackage ../tools/haskell/haskell-language-server/hls-brittany.nix { }; hls-hlint-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-hlint-plugin.nix { }; hls-tactics-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-tactics-plugin.nix { }; + hls-explicit-imports-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix { }; + hls-retrie-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-retrie-plugin.nix { }; nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { }; diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index 68819fa7ab063..c22ad3f4cb0f1 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -73,7 +73,7 @@ let flags = [ "-nostdinc" "-nostdinc++" - "-isystem" "${glibc.dev}/include" + "-isystem" "${stdenv.lib.getDev stdenv.cc.libc}/include" "-I" "${unwrapped}/include" "-I" "${unwrapped}/lib/clang/5.0.2/include" ]; diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 7e79ff8f117aa..5c094893982c3 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -14,6 +14,19 @@ let }; in rec { + lua5_4 = callPackage ./interpreter.nix { + sourceVersion = { major = "5"; minor = "4"; patch = "2"; }; + hash = "0ksj5zpj74n0jkamy3di1p6l10v4gjnd2zjnb453qc6px6bhsmqi"; + patches = [ + # build lua as a shared library as well, MIT-licensed from + # https://github.com/archlinux/svntogit-packages/tree/packages/lua/trunk + ./liblua.so.patch + ]; + }; + + lua5_4_compat = lua5_4.override({ + compat = true; + }); lua5_3 = callPackage ./interpreter.nix { sourceVersion = { major = "5"; minor = "3"; patch = "5"; }; diff --git a/pkgs/development/interpreters/lua-5/liblua.so.patch b/pkgs/development/interpreters/lua-5/liblua.so.patch new file mode 100644 index 0000000000000..197832116c19b --- /dev/null +++ b/pkgs/development/interpreters/lua-5/liblua.so.patch @@ -0,0 +1,60 @@ +diff --git a/Makefile b/Makefile +index 416f444..eeaff03 100644 +--- a/Makefile ++++ b/Makefile +@@ -52,7 +52,7 @@ R= $V.0 + all: $(PLAT) + + $(PLATS) help test clean: +- @cd src && $(MAKE) $@ ++ @cd src && $(MAKE) $@ V=$(V) R=$(R) + + install: dummy + cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) +diff --git a/src/Makefile b/src/Makefile +index 514593d..372a6dc 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -33,6 +33,7 @@ CMCFLAGS= -Os + PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o + LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o + BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) +@@ -44,7 +45,7 @@ LUAC_T= luac + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + # Targets start here. +@@ -60,6 +61,12 @@ $(LUA_A): $(BASE_O) + $(AR) $@ $(BASE_O) + $(RANLIB) $@ + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) ++ ++ + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + +diff --git a/src/luaconf.h b/src/luaconf.h +index bdf927e..7e15198 100644 +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -227,7 +227,7 @@ + + #else /* }{ */ + +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" + diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 841f89b97fbdd..67fca52dad51e 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -23,15 +23,17 @@ , fftwSinglePrec , zlib , curl -, qrupdate , blas, lapack -, arpack +# These two should use the same lapack and blas as the above +, qrupdate, arpack, suitesparse ? null +# If set to true, the above 5 deps are overriden to use the blas and lapack +# with 64 bit indexes support. If all are not compatible, the build will fail. +, use64BitIdx ? false , libwebp , gl2ps , ghostscript ? null , hdf5 ? null , glpk ? null -, suitesparse ? null , gnuplot ? null # - Include support for GNU readline: , enableReadline ? true @@ -41,7 +43,7 @@ , jdk ? null , python ? null , overridePlatforms ? null -, sundials_2 ? null +, sundials ? null # - Build Octave Qt GUI: , enableQt ? false , qtbase ? null @@ -56,9 +58,42 @@ , darwin }: -assert (!blas.isILP64) && (!lapack.isILP64); - -mkDerivation rec { +let + # Not always evaluated + blas' = if use64BitIdx then + blas.override { + isILP64 = true; + } + else + blas + ; + lapack' = if use64BitIdx then + lapack.override { + isILP64 = true; + } + else + lapack + ; + qrupdate' = qrupdate.override { + # If use64BitIdx is false, this override doesn't evaluate to a new + # derivation, as blas and lapack are not overriden. + blas = blas'; + lapack = lapack'; + }; + arpack' = arpack.override { + blas = blas'; + lapack = lapack'; + }; + # Not always suitesparse is required at all + suitesparse' = if suitesparse != null then + suitesparse.override { + blas = blas'; + lapack = lapack'; + } + else + null + ; +in mkDerivation rec { version = "6.1.0"; pname = "octave"; @@ -78,34 +113,36 @@ mkDerivation rec { fltk zlib curl - blas - lapack + blas' + lapack' libsndfile fftw fftwSinglePrec portaudio - qrupdate - arpack + qrupdate' + arpack' libwebp gl2ps ] - ++ (stdenv.lib.optionals enableQt [ + ++ stdenv.lib.optionals enableQt [ qtbase qtsvg qscintilla - ]) - ++ (stdenv.lib.optional (ghostscript != null) ghostscript) - ++ (stdenv.lib.optional (hdf5 != null) hdf5) - ++ (stdenv.lib.optional (glpk != null) glpk) - ++ (stdenv.lib.optional (suitesparse != null) suitesparse) - ++ (stdenv.lib.optional (enableJava) jdk) - ++ (stdenv.lib.optional (sundials_2 != null) sundials_2) - ++ (stdenv.lib.optional (gnuplot != null) gnuplot) - ++ (stdenv.lib.optional (python != null) python) - ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ]) - ++ (stdenv.lib.optionals (stdenv.isDarwin) [ libiconv - darwin.apple_sdk.frameworks.Accelerate - darwin.apple_sdk.frameworks.Cocoa ]) + ] + ++ stdenv.lib.optionals (ghostscript != null) [ ghostscript ] + ++ stdenv.lib.optionals (hdf5 != null) [ hdf5 ] + ++ stdenv.lib.optionals (glpk != null) [ glpk ] + ++ stdenv.lib.optionals (suitesparse != null) [ suitesparse' ] + ++ stdenv.lib.optionals (enableJava) [ jdk ] + ++ stdenv.lib.optionals (sundials != null) [ sundials ] + ++ stdenv.lib.optionals (gnuplot != null) [ gnuplot ] + ++ stdenv.lib.optionals (python != null) [ python ] + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.Accelerate + darwin.apple_sdk.frameworks.Cocoa + ] ; nativeBuildInputs = [ pkgconfig @@ -115,12 +152,12 @@ mkDerivation rec { fftwSinglePrec texinfo ] - ++ (stdenv.lib.optional (sundials_2 != null) sundials_2) - ++ (stdenv.lib.optional enableJIT llvm) - ++ (stdenv.lib.optionals enableQt [ + ++ stdenv.lib.optionals (sundials != null) [ sundials ] + ++ stdenv.lib.optionals enableJIT [ llvm ] + ++ stdenv.lib.optionals enableQt [ qtscript qttools - ]) + ] ; doCheck = !stdenv.isDarwin; @@ -128,14 +165,14 @@ mkDerivation rec { enableParallelBuilding = true; # See https://savannah.gnu.org/bugs/?50339 - F77_INTEGER_8_FLAG = if blas.isILP64 then "-fdefault-integer-8" else ""; + F77_INTEGER_8_FLAG = if use64BitIdx then "-fdefault-integer-8" else ""; configureFlags = [ "--with-blas=blas" "--with-lapack=lapack" - (if blas.isILP64 then "--enable-64" else "--disable-64") + (if use64BitIdx then "--enable-64" else "--disable-64") ] - ++ (if stdenv.isDarwin then [ "--enable-link-all-dependencies" ] else [ ]) + ++ stdenv.lib.optionals stdenv.isDarwin [ "--enable-link-all-dependencies" ] ++ stdenv.lib.optionals enableReadline [ "--enable-readline" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "--with-x=no" ] ++ stdenv.lib.optionals enableQt [ "--with-qt=5" ] @@ -149,14 +186,20 @@ mkDerivation rec { ''; passthru = { - inherit version; sitePath = "share/octave/${version}/site"; + blas = blas'; + lapack = lapack'; + qrupdate = qrupdate'; + arpack = arpack'; + suitesparse = suitesparse'; + inherit python; + inherit enableQt enableJIT enableReadline enableJava; }; meta = { homepage = "https://www.gnu.org/software/octave/"; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [raskin]; + maintainers = with stdenv.lib.maintainers; [ raskin doronbehar ]; description = "Scientific Pragramming Language"; # https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT broken = enableJIT; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index ac41a63cef77c..6b7d1d4d99cce 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -174,11 +174,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 = "6c115604fcbf01ceb3c6d7c13206a7590abf6c21"; # Nov 22, 2020 + crossVersion = "b4447944a0aeff9590dc023d64f8ddf3de7669fb"; # Dec 22, 2020 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "1xb3krm7m3f7lhq774pf48czyfa8378jahg1q0kkcz8alrl270w1"; + sha256 = "1cignplkb29kcvkfwshakyij71w8srlfqbnb9pla98vya6r82rnb"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -214,7 +214,7 @@ in { perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.33.4"; - sha256 = "02r8d0wrwaj0vgqbbqidhqgck2xp5k9g49aslj9faqcmgpsj5kcz"; + version = "5.33.5"; + sha256 = "04iprc8qz6vpbgzqgwja5rc3csvmgq1rnnnl382l39hy69fsdqpr"; }; } diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 4a96abcf9b693..82134e14406f8 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -13,6 +13,7 @@ let , version , sha256 , extraPatches ? [] + , packageOverrides ? (final: prev: {}) # Sapi flags , cgiSupport ? true @@ -49,8 +50,8 @@ let php = generic filteredArgs; php-packages = (callPackage ../../../top-level/php-packages.nix { - php = phpWithExtensions; - }); + phpPackage = phpWithExtensions; + }).overrideScope' packageOverrides; allExtensionFunctions = prevExtensionFunctions ++ [ extensions ]; enabledExtensions = @@ -112,7 +113,8 @@ let phpIni = "${phpWithExtensions}/lib/php.ini"; unwrapped = php; tests = nixosTests.php; - inherit (php-packages) packages extensions buildPecl; + inherit (php-packages) extensions buildPecl; + packages = php-packages.tools; meta = php.meta // { outputsToInstall = [ "out" ]; }; diff --git a/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch index a1f9d68eb1663..41d3ab52345b2 100644 --- a/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch +++ b/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch @@ -1,19 +1,19 @@ -From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk <fridh@fridh.nl> -Date: Mon, 28 Aug 2017 09:24:06 +0200 +From 66f492d2eda94bd64db833839a325caf6ba0fed5 Mon Sep 17 00:00:00 2001 +From: Greg Roodt <greg@canva.com> +Date: Wed, 9 Dec 2020 17:59:24 +1100 Subject: [PATCH] Don't use ldconfig --- - Lib/ctypes/util.py | 70 ++---------------------------------------------------- - 1 file changed, 2 insertions(+), 68 deletions(-) + Lib/ctypes/util.py | 77 ++-------------------------------------------- + 1 file changed, 2 insertions(+), 75 deletions(-) diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 5e8b31a854..7b45ce6c15 100644 +index 0c2510e161..7fb98af308 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py -@@ -94,46 +94,7 @@ elif os.name == "posix": - import re, tempfile - +@@ -100,53 +100,7 @@ elif os.name == "posix": + return thefile.read(4) == elf_header + def _findLib_gcc(name): - # Run GCC's linker with the -t (aka --trace) option and examine the - # library name it prints out. The GCC command will fail because we @@ -51,17 +51,24 @@ index 5e8b31a854..7b45ce6c15 100644 - # Raised if the file was already removed, which is the normal - # behaviour of GCC if linking fails - pass -- res = re.search(expr, trace) +- res = re.findall(expr, trace) - if not res: - return None -- return os.fsdecode(res.group(0)) +- +- for file in res: +- # Check if the given file is an elf file: gcc can report +- # some files that are linker scripts and not actual +- # shared objects. See bpo-41976 for more details +- if not _is_elf(file): +- continue +- return os.fsdecode(file) + return None - - + + if sys.platform == "sunos5": -@@ -255,34 +216,7 @@ elif os.name == "posix": +@@ -268,34 +222,7 @@ elif os.name == "posix": else: - + def _findSoname_ldconfig(name): - import struct - if struct.calcsize('l') == 4: @@ -92,9 +99,8 @@ index 5e8b31a854..7b45ce6c15 100644 - except OSError: - pass + return None - + def _findLib_ld(name): # See issue #9998 for why this is needed --- -2.15.0 - +-- +2.24.3 (Apple Git-128) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 7c3f94dcd16e9..a217f62986db4 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -167,10 +167,10 @@ in { sourceVersion = { major = "3"; minor = "9"; - patch = "0"; + patch = "1"; suffix = ""; }; - sha256 = "0m18z05nlmqm1zjw9s0ifgrn1jvjn3jwjg0bpswhjmw5k4yfcwww"; + sha256 = "1zq3k4ymify5ig739zyvx9s2ainvchxb1zpy139z74krr653y74r"; inherit (darwin) configd; inherit passthruFun; }; @@ -181,9 +181,9 @@ in { major = "3"; minor = "10"; patch = "0"; - suffix = "a2"; + suffix = "a3"; }; - sha256 = "0zl5h61s8n2w2v1n40af0mwaw7lqh5fl1ys7kyjgcph60vb9wzjr"; + sha256 = "sha256-sJjJdAdxOUfX7W7VioSGdxlgp2lyMOPZjg42MCd/JYY="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 0d7707000418c..c645fae0d8481 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2020.11"; + version = "2020.12"; src = fetchurl { url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "107sskgf0p6npm3vjpv5wrqgfa007af6bxxiv1wgiyzx7maqdw5n"; + sha256 = "1g3ciwhlac85d6l2kqslw8pm4bjjd1z79m1c5ll0fxmr6awgpk67"; }; buildInputs = [ icu zlib gmp perl ]; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 5cd0b50e69584..54b487c259510 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2020.11"; + version = "2020.12"; src = fetchurl { url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "1163zv1fglgwbk6pppzbjwcgzpp13ilg5cz7fawsfnzdnrrq40kd"; + sha256 = "18iys1bdb92asggrsz7sg1hh76j7kq63c3fgg33fnla18qf4z488"; }; buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index ad17808281fe5..04b628bc9dae9 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2020.11"; + version = "2020.12"; src = fetchurl { url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "03whmlc6bmwmwrddwd5vqmir0gzwnmf0apvl2q1na09qqj3zb1br"; + sha256 = "13h64d41fwggc3lg4bpllg4jrp64clm7nmnw4g2jyjl47cy5ni7x"; }; buildInputs = [ perl ]; diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 1979bdf5df171..ca3503489868c 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.1.1"; + version = "5.2"; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "1h4kj37zh60zap1gvpkvcl1b1lbdvav959gd59pq2c33i0ziagf6"; + sha256 = "1+ov1fu79MXoW0D8odInMZPFMYg69st//PoMW42oXpA="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 6470566d5c716..b028813558f52 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "aws-c-common"; @@ -13,15 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - # can be removed once https://github.com/awslabs/aws-c-common/pull/735 gets merged, and version bumped - patches = [ - (fetchpatch { - name = "fix-re-export-of-target.patch"; - url = "https://github.com/awslabs/aws-c-common/pull/735/commits/3fca5c629ce0c4d66f50f7152685f3fe73941cb4.patch"; - sha256 = "056f9kyg1c4lwjq8n0r28w1n3zbwrwpi1wbqabk99gaayg46x35a"; - }) - ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-nullability-extension -Wno-typedef-redefinition"; diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index ea3633d2e4d94..d4ba15e52db4a 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "aws-checksums"; @@ -13,14 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - # can be removed once https://github.com/awslabs/aws-checksums/pull/40 gets merged, and version bumped - patches = [ - (fetchpatch { - url = "https://github.com/awslabs/aws-checksums/pull/40/commits/fb5a57b3c072bd88e45de76fbb76bdc89c67b193.patch"; - sha256 = "056f9kyg1c4lwjq8n0r28w1n3zbwrwpi1wbqabk99gaayg46x35a"; - }) - ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS:BOOL=ON" ]; meta = with lib; { diff --git a/pkgs/development/libraries/bcg729/default.nix b/pkgs/development/libraries/bcg729/default.nix index 4363948e830dd..f178c192de547 100644 --- a/pkgs/development/libraries/bcg729/default.nix +++ b/pkgs/development/libraries/bcg729/default.nix @@ -1,42 +1,28 @@ { stdenv -, fetchFromGitHub -, fetchpatch +, fetchFromGitLab , cmake }: stdenv.mkDerivation rec { pname = "bcg729"; - version = "1.0.4"; + version = "1.1.1"; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; repo = pname; rev = version; - sha256 = "05s0c5ps3a763y0v34wg5zghj0cdjnq4ch7g81848xxry7q90fwa"; + sha256 = "1hal6b3w6f8y5r1wa0xzj8sj2jjndypaxyw62q50p63garp2h739"; }; - patches = [ - (fetchpatch { - url = "https://github.com/BelledonneCommunications/bcg729/commit/a5907daf1b111e4ad7aab4f558f57e2af1e37e55.patch"; - sha256 = "0445syfwj4w4chh8ak80rq77iqcr27924n1ld5snshk3d21nxd64"; - }) - (fetchpatch { - url = "https://github.com/BelledonneCommunications/bcg729/commit/697bf6653a8c7421f0e821ee8d42471246e6850f.patch"; - sha256 = "1h3gf5sj2sg5cs5iv1lcav3lkqmd5jf4agvjzz83l89wd5f5hp5l"; - }) - (fetchpatch { - url = "https://github.com/BelledonneCommunications/bcg729/commit/d63ce04a93711820d9a6985b1d11d8d91ed8e6b6.patch"; - sha256 = "1piwf63ci2gma6jd6b4adkvxirysvazf0vklb5pc6vx1g93nkgxs"; - }) - ]; - nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "Opensource implementation of both encoder and decoder of the ITU G729 Annex A/B speech codec"; homepage = "https://linphone.org/technical-corner/bcg729"; changelog = "https://gitlab.linphone.org/BC/public/bcg729/raw/${version}/NEWS"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ c0bw3b ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 0f99484f5a08d..655d3a5808a9b 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.13"; + version = "4.4.21"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -30,9 +30,7 @@ stdenv.mkDerivation rec { inherit version; description = "Utilities library for Linphone"; homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; - # Still using GPLv2 but as the rest of the Linphone projects have switched - # to GPLv3, this might too, so check this when bumping the version number. - license = licenses.gpl3Only; + license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin jluttine ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index ae9b1e6e43c55..35de9fb934775 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ library to manipulate VCard standard format"; homepage = "https://gitlab.linphone.org/BC/public/belcard"; - license = licenses.lgpl21; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 788e656301ba8..8a028b5e0a061 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "4.4.13"; + version = "4.4.21"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1ad7sqc5y4f3gc8glwmb3rvfzapnvhg981g13x90cg4nzikjvka0"; + sha256 = "0ylv1jsqnfhw23i6p3lfqqzw48lwii8zwkq3y34q0hhnngn26iiw"; }; - nativeBuildInputs = [ cmake antlr3_4 ]; + nativeBuildInputs = [ antlr3_4 cmake ]; buildInputs = [ zlib ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://linphone.org/technical-corner/belle-sip"; description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index 546949d9f21cb..ab3df9bae7ee0 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -6,17 +6,15 @@ stdenv.mkDerivation rec { pname = "belr"; - # Using master branch for linphone-desktop caused a chain reaction that many - # of its dependencies needed to use master branch too. - version = "unstable-2020-03-09"; + version = "4.3.2"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; owner = "public"; group = "BC"; repo = pname; - rev = "326d030ca9db12525c2a6d2a65f386f36f3c2ed5"; - sha256 = "1cdblb9smncq3al0crqp5651b02k1g6whlw1ib769p61gad0rs3v"; + rev = version; + sha256 = "1lda0f89vas38xgmc4yvnrigmrbril3dyqxgb5jh1zfx1xczfh1q"; }; buildInputs = [ bctoolbox ]; @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Belledonne Communications' language recognition library"; homepage = "https://gitlab.linphone.org/BC/public/belr"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/libraries/boost/1.75.nix b/pkgs/development/libraries/boost/1.75.nix new file mode 100644 index 0000000000000..9912032c77743 --- /dev/null +++ b/pkgs/development/libraries/boost/1.75.nix @@ -0,0 +1,15 @@ +{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.75.0"; + + src = fetchurl { + urls = [ + "mirror://sourceforge/boost/boost_1_75_0.tar.bz2" + "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_75_0.html + sha256 = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb"; + }; +}) + diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index a195a2c7bb981..b3950cb0d3012 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,4 +1,5 @@ { stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv +, fetchpatch , which , buildPackages , toolset ? /**/ if stdenv.cc.isClang then "clang" @@ -113,6 +114,14 @@ stdenv.mkDerivation { if version == "1.55.0" then ./darwin-1.55-no-system-python.patch else ./darwin-no-system-python.patch) + # Fix boost-context segmentation faults on ppc64 due to ABI violation + ++ optional (versionAtLeast version "1.61" && + versionOlder version "1.71") (fetchpatch { + url = "https://github.com/boostorg/context/commit/2354eca9b776a6739112833f64754108cc0d1dc5.patch"; + sha256 = "067m4bjpmcanqvg28djax9a10avmdwhlpfx6gn73kbqqq70dnz29"; + stripLen = 1; + extraPrefix = "libs/context/"; + }) ++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch; diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix index 22ddb76b29bd7..2346153e2a153 100644 --- a/pkgs/development/libraries/botan/2.0.nix +++ b/pkgs/development/libraries/botan/2.0.nix @@ -1,9 +1,9 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - baseVersion = "2.9"; - revision = "0"; - sha256 = "06fiyalvc68p11qqh953azx2vrbav5vr00yvcfp67p9l4csn8m9h"; + baseVersion = "2.17"; + revision = "2"; + sha256 = "0v0yiq0qxcrsn5b34j6bz8i6pds8dih2ds90ylmy1msm5gz7vqpb"; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 04652aa013aaa..8bcc6aaa8efbf 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -4,6 +4,7 @@ callPackage ./generic.nix (args // { baseVersion = "1.10"; revision = "17"; sha256 = "04rnha712dd3sdb2q7k2yw45sf405jyigk7yrjfr6bwd9fvgyiv8"; + sourceExtension = "tgz"; extraConfigureFlags = "--with-gnump"; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 18b1b47f6d383..4d2cf7515c039 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, python, bzip2, zlib, gmp, openssl, boost # Passed by version specific builders , baseVersion, revision, sha256 +, sourceExtension ? "tar.xz" , extraConfigureFlags ? "" , postPatch ? null , darwin @@ -12,10 +13,10 @@ stdenv.mkDerivation rec { version = "${baseVersion}.${revision}"; src = fetchurl { - name = "Botan-${version}.tgz"; + name = "Botan-${version}.${sourceExtension}"; urls = [ - "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.tgz" - "http://botan.randombit.net/releases/Botan-${version}.tgz" + "http://files.randombit.net/botan/v${baseVersion}/Botan-${version}.${sourceExtension}" + "http://botan.randombit.net/releases/Botan-${version}.${sourceExtension}" ]; inherit sha256; }; diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 4fe53a5d629de..3eb99549246e9 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.0"; + version = "4.4.9"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -29,9 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An opensource implementation of ZRTP keys exchange protocol"; homepage = "https://gitlab.linphone.org/BC/public/bzrtp"; - # They have switched to GPLv3 on git HEAD so probably the next release will - # be GPL3. - license = licenses.lgpl21; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 26a943791e905..18f029c45852e 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -12,11 +12,11 @@ assert runTests -> gflags != null; stdenv.mkDerivation rec { pname = "ceres-solver"; - version = "1.14.0"; + version = "2.0.0"; src = fetchurl { url = "http://ceres-solver.org/ceres-solver-${version}.tar.gz"; - sha256 = "13lfxy8x58w8vprr0nkbzziaijlh0vvqshgahvcgw0mrqdgh0i27"; + sha256 = "00vng9vnmdb1qga01m0why90m0041w7bn6kxa2h4m26aflfqla8h"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix new file mode 100644 index 0000000000000..35e12eb00c7ba --- /dev/null +++ b/pkgs/development/libraries/entt/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, cmake }: +stdenv.mkDerivation rec { + pname = "entt"; + version = "3.5.2"; + + src = fetchFromGitHub { + owner = "skypjack"; + repo = "entt"; + rev = "v${version}"; + sha256 = "1p09p1wn8cbj17z83iyyy2498wy1gzyi2mmqi5i2cxglslbm6hy0"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/skypjack/entt"; + description = "A header-only, tiny and easy to use library for game programming and much more written in modern C++"; + maintainers = with maintainers; [ twey ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index f9e4720f64303..1db8a9fbe2f31 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -1,28 +1,28 @@ { stdenv, fetchFromGitHub, alsaLib }: -stdenv.mkDerivation { - name = "flite-2.1.0"; +stdenv.mkDerivation rec { + pname = "flite"; + version = "2.2"; src = fetchFromGitHub { - owner = "festvox"; - repo = "flite"; - rev = "d673f65b2c4a8cd3da7447079309a6dc4bcf1a5e"; - sha256 = "1kx43jvdln370590gfjhxxz3chxfi6kq18504wmdpljib2l0grjq"; + owner = "festvox"; + repo = "flite"; + rev = "v${version}"; + sha256 = "1n0p81jzndzc1rzgm66kw9ls189ricy5v1ps11y0p2fk1p56kbjf"; }; - buildInputs = [ alsaLib ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ alsaLib ]; configureFlags = [ "--enable-shared" - "--with-audio=alsa" - ]; + ] ++ stdenv.lib.optionals stdenv.isLinux [ "--with-audio=alsa" ]; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "A small, fast run-time speech synthesis engine"; homepage = "http://www.festvox.org/flite/"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsdOriginal; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index be648cf5a8451..62f73a361916d 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,18 +1,37 @@ -{ stdenv, fetchFromGitHub, cmake, boost, libevent, double-conversion, glog -, gflags, libiberty, openssl }: +{ stdenv +, fetchFromGitHub +, cmake +, boost +, libevent +, double-conversion +, glog +, gflags +, libiberty +, lz4 +, lzma +, zlib +, jemalloc +, openssl +, pkg-config +, libunwind +, fmt +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { pname = "folly"; - version = "2019.11.11.00"; + version = "2020.09.28.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "1sgv7sdalbs7zhz3zcc95gn2h8j2xjf7hkw2c618zc3pdn6aa58w"; + sha256 = "1ry2nqfavcbz0jvsqw71105gbxm5hpmdi2k1w155m957jrv3n5vg"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; # See CMake/folly-deps.cmake in the Folly source tree. buildInputs = [ @@ -23,9 +42,15 @@ stdenv.mkDerivation rec { libevent libiberty openssl + lz4 + lzma + zlib + jemalloc + libunwind + fmt ]; - enableParallelBuilding = true; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; meta = with stdenv.lib; { description = "An open-source C++ library developed and used at Facebook"; @@ -35,4 +60,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ abbradar pierreis ]; }; -} +} // stdenv.lib.optionalAttrs stdenv.isDarwin { + LDFLAGS = "-ljemalloc"; +}) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 2d6fae915f8ca..f95818b399c97 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "gdk-pixbuf"; - version = "2.42.0"; + version = "2.42.2"; outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ixfmmamgv67is7snzighfr7c9y2maq3q4a075xdq0d9s4w16i3k"; + sha256 = "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3"; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index c5edeb2021f55..49343e79c8788 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -89,13 +89,13 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.18.1"; + version = "1.18.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1cn18cbqyysrxnrk5bpxdzd5xcws9g2kmm5rbv00cx6rhn69g5f1"; + sha256 = "06ildd4rl6cynirv3p00d2ddf5is9svj4i7mkahldzhq24pq5mca"; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index da3434a77cd28..4728e49c51629 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-base"; - version = "1.18.1"; + version = "1.18.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0hf66sh8d4x2ksfnvaq2rqrrfq0vi0pv6wbh9i5jixrhvvbm99hv"; + sha256 = "1b05kg46azrxxvq42c71071lfsnc34pw4vynnkczdqi6g0gzn16x"; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 3ea0bd8903af2..c2a639dff2431 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "gstreamer"; - version = "1.18.1"; + version = "1.18.2"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1fpcpsw740svvdxvvwn0hly5i72miizm4s0mbid10ji83zi8vpvr"; + sha256 = "0ijlmvr660m8zn09xlmnq1ajrziqsivp2hig5a9mabhcjx7ypkb6"; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index fe4c7005f603b..6743a5ecd6752 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.18.1"; + version = "1.18.2"; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1pxhg8n5nl34baq6mb07i27b33gaw47zrv5yalyj6f12pnx148ki"; + sha256 = "0mhascwvgirgh7b5dykpnk06f7f5g62gh3sl30i6kygiidqkv9vf"; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 075b2059dbf98..75e065e6d2be7 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.18.1"; + version = "1.18.2"; outputs = [ "out" @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "09rr5a198p1r9wcbsjl01xg6idkfkgj5h9x7xxywarb5i7qv6g79"; + sha256 = "0pv2k8zlpn3vv2sdlspi3m63ixcwzi90pjly2ypbkg59ab97rb15"; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 99b00e6ca9d7f..d4c3b99c7ca99 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -51,13 +51,13 @@ let in stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.18.1"; + version = "1.18.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0v329xi4qhlfh9aksfyviryqk9lclm4wj1lxrjnbdv4haldfj472"; + sha256 = "1929nhjsvbl4bw37nfagnfsnxz737cm2x3ayz9ayrn9lwkfm45zp"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 276352473917f..c75d439cd53f5 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.18.1"; + version = "1.18.2"; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1n1fkkbxxsndblnbm0c2ziqp967hrz5gag6z36xbpvqk4sy1g9rr"; + sha256 = "0jbzams9ggk3sq9ywv4gsl9rghyn203l2582m6l5c1sz9ka9m5in"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 87aca8a7cf902..4167b17277690 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.18.1"; + version = "1.18.2"; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0m7p7sarvi6n9pz0rrl9k3gp3l5s42qs8z0165kyd6fiqdjjia0h"; + sha256 = "1qjlp7az0hkzxvq53hwnp55sp6xhbybfwzaj66hp45jslsmj4fcp"; }; outputs = [ diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index ab922f98808f8..1cdc0a5193000 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.18.1"; + version = "1.18.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "09gpbykjchw3lb51ipxj53fy238gr9mg9jybcg5135pb56w6rk8q"; + sha256 = "1nwbcv5yaib3d8icvyja3zf6lyjf5zf1hndbijrhj8j7xlia0dx3"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index a1a6223798fa3..52a6cb27894b2 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.18.1"; + version = "1.18.2"; src = fetchurl { url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1sm6x2qa7ng78w0w8q4mjs7pbpbbk8qkfgzhdmbb8l0bh513q3a0"; + sha256 = "1h67n7wk1297rzynknbyv44gdacblvkcvb37x8yxi5d0zms2qywc"; }; outputs = [ diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index aee846ccfcd0c..654ad3116a443 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -51,7 +51,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.23"; + version = "3.24.24"; outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "1cg2vbwbcp7bc84ky0b69ipgdr9djhspnf5k8lajb8jphcj4v1jx"; + sha256 = "12ipk1d376bai9v820qzhxba93kkh5abi6mhyqr4hwjvqmkl77fc"; }; patches = [ @@ -73,13 +73,6 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - - # Fix path handling in pkg-config. MR for the gtk-3-24 branch: - # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2605 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/commit/6d9db8610eff8c12d594d53b7813d9eea1247801.patch"; - sha256 = "0rd1kjh0m4mrj2hkcqlsq1j0d6ahn5c237fd211r158gd1jiwys0"; - }) ] ++ optionals stdenv.isDarwin [ # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it diff --git a/pkgs/development/libraries/inih/default.nix b/pkgs/development/libraries/inih/default.nix new file mode 100644 index 0000000000000..62de607f7d438 --- /dev/null +++ b/pkgs/development/libraries/inih/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, meson, ninja }: + +stdenv.mkDerivation rec { + pname = "inih"; + version = "r52"; + + src = fetchFromGitHub { + owner = "benhoyt"; + repo = pname; + rev = version; + sha256 = "0lsvm34zabvi1xlximybzvgc58zb90mm3b9babwxlqs05jy871m4"; + }; + + nativeBuildInputs = [ meson ninja ]; + + mesonFlags = [ + "-Ddefault_library=shared" + "-Ddistro_install=true" + "-Dwith_INIReader=true" + ]; + + meta = with stdenv.lib; { + description = "Simple .INI file parser in C, good for embedded systems"; + homepage = "https://github.com/benhoyt/inih"; + changelog = "https://github.com/benhoyt/inih/releases/tag/${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ TredwellGit ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 839b2eb466d52..ea38934b000ef 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=(https://download.kde.org/stable/frameworks/5.73/) +WGET_ARGS=(https://download.kde.org/stable/frameworks/5.76/) diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix index 65377789582e6..1b326e51de929 100644 --- a/pkgs/development/libraries/kde-frameworks/kded.nix +++ b/pkgs/development/libraries/kde-frameworks/kded.nix @@ -1,16 +1,22 @@ { - mkDerivation, lib, propagate, + mkDerivation, lib, propagate, wrapGAppsHook, extra-cmake-modules, kdoctools, - kconfig, kcoreaddons, kcrash, kdbusaddons, kinit, kservice, qtbase, + gsettings-desktop-schemas, kconfig, kcoreaddons, kcrash, kdbusaddons, kinit, + kservice, qtbase, }: mkDerivation { name = "kded"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; buildInputs = [ - kconfig kcoreaddons kcrash kdbusaddons kinit kservice qtbase + gsettings-desktop-schemas kconfig kcoreaddons kcrash kdbusaddons kinit + kservice qtbase ]; outputs = [ "out" "dev" ]; setupHook = propagate "out"; + dontWrapGApps = true; + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; } diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index ca015151e0f1c..483ab16dcc317 100644 --- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix @@ -1,16 +1,18 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem, - qtbase, qttools, qtx11extras, + qtbase, qttools, qtx11extras, libXdmcp, }: mkDerivation { name = "kglobalaccel"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qttools - qtx11extras + qtx11extras libXdmcp ]; + outputs = [ "out" "dev" ]; propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch b/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch new file mode 100644 index 0000000000000..609376e33e442 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch @@ -0,0 +1,50 @@ +From 291f691400d4e85c57b57ec75482d2c6078ce26e Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@mailbox.org> +Date: Wed, 9 Dec 2020 10:01:59 -0600 +Subject: [PATCH] platform plugins path + +--- + src/pluginwrapper.cpp | 27 +++++++++++++-------------- + 1 file changed, 13 insertions(+), 14 deletions(-) + +diff --git a/src/pluginwrapper.cpp b/src/pluginwrapper.cpp +index a255d83..9699b08 100644 +--- a/src/pluginwrapper.cpp ++++ b/src/pluginwrapper.cpp +@@ -25,20 +25,19 @@ static QStringList pluginCandidates() + { + QStringList ret; + const auto paths = QCoreApplication::libraryPaths(); +- for (const QString &path : paths) { +- static const QStringList searchFolders { +- QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"), +- QStringLiteral("/kf5/kwindowsystem"), +- }; +- for (const QString &searchFolder : searchFolders) { +- QDir pluginDir(path + searchFolder); +- if (!pluginDir.exists()) { +- continue; +- } +- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); +- for (const QString &entry : entries) { +- ret << pluginDir.absoluteFilePath(entry); +- } ++ const QString path = QStringLiteral(NIXPKGS_QT_PLUGIN_PATH); ++ static const QStringList searchFolders { ++ QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"), ++ QStringLiteral("/kf5/kwindowsystem"), ++ }; ++ for (const QString &searchFolder : searchFolders) { ++ QDir pluginDir(path + searchFolder); ++ if (!pluginDir.exists()) { ++ continue; ++ } ++ const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); ++ for (const QString &entry : entries) { ++ ret << pluginDir.absoluteFilePath(entry); + } + } + return ret; +-- +2.28.0 + diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index 1e77b63f7c9aa..ab93966c0ac96 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -9,13 +9,13 @@ mkDerivation { name = "kwindowsystem"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = lib.versionOlder qtbase.version "5.7.0"; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; propagatedBuildInputs = [ qtbase ]; patches = [ - ./platform-plugins-path.patch + ./0001-platform-plugins-path.patch ]; preConfigure = '' NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\"" diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch b/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch deleted file mode 100644 index 27501732210fa..0000000000000 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: kwindowsystem-5.64.0/src/pluginwrapper.cpp -=================================================================== ---- kwindowsystem-5.64.0.orig/src/pluginwrapper.cpp -+++ kwindowsystem-5.64.0/src/pluginwrapper.cpp -@@ -37,16 +37,10 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapp - static QStringList pluginCandidates() - { - QStringList ret; -- const auto paths = QCoreApplication::libraryPaths(); -- for (const QString &path : paths) { -- QDir pluginDir(path + QLatin1String("/kf5/org.kde.kwindowsystem.platforms")); -- if (!pluginDir.exists()) { -- continue; -- } -- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); -- for (const QString &entry : entries) { -- ret << pluginDir.absoluteFilePath(entry); -- } -+ QDir pluginDir(QLatin1String(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms")); -+ const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); -+ for (const QString &entry : entries) { -+ ret << pluginDir.absoluteFilePath(entry); - } - return ret; - } diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix index 1484b2d048917..6f1527da77871 100644 --- a/pkgs/development/libraries/kde-frameworks/purpose.nix +++ b/pkgs/development/libraries/kde-frameworks/purpose.nix @@ -1,6 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, qtbase , qtdeclarative, kconfig, kcoreaddons, ki18n, kio, kirigami2 +, fetchpatch }: mkDerivation { @@ -8,7 +9,7 @@ mkDerivation { meta = { maintainers = [ lib.maintainers.bkchr ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - qtbase qtdeclarative kconfig kcoreaddons + qtbase qtdeclarative kconfig kcoreaddons ki18n kio kirigami2 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 070b11f6bfb57..dbc74b831125e 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -1,670 +1,670 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks/ { fetchurl, mirror }: { attica = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/attica-5.73.0.tar.xz"; - sha256 = "011240a6ff59e2b39bcf6d4ba6128e6e60c6318c185e7316a71cfec28e69c69a"; - name = "attica-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/attica-5.76.0.tar.xz"; + sha256 = "64b262f61935653b91a83f4d1c659e7dcaf575b12aa955fe16d8392adb256e22"; + name = "attica-5.76.0.tar.xz"; }; }; baloo = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/baloo-5.73.0.tar.xz"; - sha256 = "887077ae3e090d673d2ffe7eb869a0ab6f5d14e9dae2dccd619e4689699a2dfe"; - name = "baloo-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/baloo-5.76.0.tar.xz"; + sha256 = "8ae9e6dd51c84150f7fc581ebf04617f3ee9e1f96e08df79d6f15ee29f5f95f9"; + name = "baloo-5.76.0.tar.xz"; }; }; bluez-qt = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/bluez-qt-5.73.0.tar.xz"; - sha256 = "70264edb82b2627c0ec3740374b90b8402e0f432fe4a10650fa3d22191d8cfd4"; - name = "bluez-qt-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/bluez-qt-5.76.0.tar.xz"; + sha256 = "a3f99a10e5f018bac91b4bd88be23a6ea9399aa1ab29d16840d5ee2c20537835"; + name = "bluez-qt-5.76.0.tar.xz"; }; }; breeze-icons = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/breeze-icons-5.73.0.tar.xz"; - sha256 = "b6caff26f69008a3e0d53ae5fcfcf070b70ad1b17d407daecbbabeb6a606a08b"; - name = "breeze-icons-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/breeze-icons-5.76.0.tar.xz"; + sha256 = "d0211f0e6fa9137dbb42bcad1ac352bbfe793b6a3e6483adc2051b5c24a7851b"; + name = "breeze-icons-5.76.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/extra-cmake-modules-5.73.0.tar.xz"; - sha256 = "c5e3ef0253f7d5ab3adf9185950e34fd620a3d5baaf3bcc15892f971fc3274c4"; - name = "extra-cmake-modules-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/extra-cmake-modules-5.76.0.tar.xz"; + sha256 = "4845e9e0a43ba15158c0cfdc7ab594e7d02692fab9083201715270a096704a32"; + name = "extra-cmake-modules-5.76.0.tar.xz"; }; }; frameworkintegration = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/frameworkintegration-5.73.0.tar.xz"; - sha256 = "21ef7f1a6d48f9fb14ccac9bc37e803c92cf83c9e235a5ca8bd7eb08fd0a6fb3"; - name = "frameworkintegration-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/frameworkintegration-5.76.0.tar.xz"; + sha256 = "7ac6c070190ab4c0c2ac15a921886ed7f3b70d6a0b7c41766d21a913e9f086fb"; + name = "frameworkintegration-5.76.0.tar.xz"; }; }; kactivities = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kactivities-5.73.0.tar.xz"; - sha256 = "5098f2535175ac12da91568ca554e3f5d970ae05415da1a8ba17305cb8ac3a1a"; - name = "kactivities-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kactivities-5.76.0.tar.xz"; + sha256 = "efba13d0d720502bf8bee161b688ba21704f7c213c8b95da65b77b76c9cb3422"; + name = "kactivities-5.76.0.tar.xz"; }; }; kactivities-stats = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kactivities-stats-5.73.0.tar.xz"; - sha256 = "df4b00c52e83608b2dd7345cd220143e07b65cb431cead5e9abb1e4ffd6ecd5a"; - name = "kactivities-stats-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kactivities-stats-5.76.0.tar.xz"; + sha256 = "85bb432a10a48af505a457c7ccacffad7914835f94042472083e878cabcd2c14"; + name = "kactivities-stats-5.76.0.tar.xz"; }; }; kapidox = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kapidox-5.73.0.tar.xz"; - sha256 = "b49ff6673906817ed95a3de56535594de02a9f95bcb2726abe52d0c0e0161be5"; - name = "kapidox-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kapidox-5.76.0.tar.xz"; + sha256 = "8c6c9401059d34fa2d7f052e21387d803a1131a60fcd1305ddf5d5dfe22c6d97"; + name = "kapidox-5.76.0.tar.xz"; }; }; karchive = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/karchive-5.73.0.tar.xz"; - sha256 = "25481ebbba8f58d9ab45bde804ab0d873c45550b482e27e7856b362cd9aa434f"; - name = "karchive-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/karchive-5.76.0.tar.xz"; + sha256 = "503d33b247ae24260c73aac2c48601eb4f8be3f10c9149549ea5dd2d22082a2a"; + name = "karchive-5.76.0.tar.xz"; }; }; kauth = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kauth-5.73.0.tar.xz"; - sha256 = "e334705bfc3f81c5e2f66315d40badd26d88426128432788f790ebefce1694d9"; - name = "kauth-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kauth-5.76.0.tar.xz"; + sha256 = "c277a7ab750158a56381d8f74b8ebed5205b785eca2444c65cbf59d429958a89"; + name = "kauth-5.76.0.tar.xz"; }; }; kbookmarks = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kbookmarks-5.73.0.tar.xz"; - sha256 = "b925ec1b8a1b4a2b7f2526fdbc7761de065b3c9573e41ac274773ed1b576aa51"; - name = "kbookmarks-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kbookmarks-5.76.0.tar.xz"; + sha256 = "ac5416f1ac21cb9e9fdf72a95de855a9891cea0ed7e1436a93c019b6c45af2af"; + name = "kbookmarks-5.76.0.tar.xz"; }; }; kcalendarcore = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kcalendarcore-5.73.0.tar.xz"; - sha256 = "e3486b41b833c0ba72f839d8a61bdffaf9b3ece3da20f478c2981b3296e7b713"; - name = "kcalendarcore-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kcalendarcore-5.76.0.tar.xz"; + sha256 = "e6fd390b8ba2a899e7abda3de8d9ab7e5155fede6bbee9ca2b302b931a0232ae"; + name = "kcalendarcore-5.76.0.tar.xz"; }; }; kcmutils = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kcmutils-5.73.0.tar.xz"; - sha256 = "b28bf672bbe21e8d1b4e6ea924c1bb318c81c43dcbb86bebb3f5775e18945ca9"; - name = "kcmutils-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kcmutils-5.76.0.tar.xz"; + sha256 = "0ea51ea9e46e6359c76fe099fd2cd03c20891a1cad26ea156ca921a9f0869009"; + name = "kcmutils-5.76.0.tar.xz"; }; }; kcodecs = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kcodecs-5.73.0.tar.xz"; - sha256 = "3bcb22b4f3b2f164759ab912d117c3b4b50695ae38d524f2cfb79a29488cce67"; - name = "kcodecs-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kcodecs-5.76.0.tar.xz"; + sha256 = "b4e1fe3247fdaf80f4414716f6fbcd42e8de04f64c8dd50bd13e9e9a78abf6e1"; + name = "kcodecs-5.76.0.tar.xz"; }; }; kcompletion = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kcompletion-5.73.0.tar.xz"; - sha256 = "72b0650e5ae9f30ad4ec30b55e660c826d93edfda0ef4f9436f226cbb8a9705a"; - name = "kcompletion-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kcompletion-5.76.0.tar.xz"; + sha256 = "014c56172040bf3aa27f81a6bb433914a5c22d2dfb1f8566be4cce678d09193a"; + name = "kcompletion-5.76.0.tar.xz"; }; }; kconfig = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kconfig-5.73.0.tar.xz"; - sha256 = "6046bbb8da5f3261aac7f868bfa8a8ce1015a3a8257fe0b2d37dce9e2bc3952e"; - name = "kconfig-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kconfig-5.76.0.tar.xz"; + sha256 = "153d3ed114954594b0dcc00e1317483609649c064203e6eb8b110686dbaba686"; + name = "kconfig-5.76.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kconfigwidgets-5.73.0.tar.xz"; - sha256 = "ed8a0a8158f895aebd46c4a725f77178d942cd9476a864a615a9df343da51f8e"; - name = "kconfigwidgets-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kconfigwidgets-5.76.0.tar.xz"; + sha256 = "f8eed399008a041df2da9cc3f2313df11376b94c85472900b39b9d6abcabe6d4"; + name = "kconfigwidgets-5.76.0.tar.xz"; }; }; kcontacts = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kcontacts-5.73.0.tar.xz"; - sha256 = "4351bf80f5a5417ba7e99fe557a851d1c7173fd7511fc1426375c66692e748bb"; - name = "kcontacts-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kcontacts-5.76.0.tar.xz"; + sha256 = "4a9e3189b4ed1bc0231bf98cba134e78e5a692a14d202f0311f6e5c5190cfad5"; + name = "kcontacts-5.76.0.tar.xz"; }; }; kcoreaddons = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kcoreaddons-5.73.0.tar.xz"; - sha256 = "24a7713eaef2f40e648a586e22b030192321f9fecdbae77013b00446fa0d6d51"; - name = "kcoreaddons-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kcoreaddons-5.76.0.tar.xz"; + sha256 = "fbab3e3e18f42922ecdc50138ed31f62007cafa902b959d89b1233b5557282d6"; + name = "kcoreaddons-5.76.0.tar.xz"; }; }; kcrash = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kcrash-5.73.0.tar.xz"; - sha256 = "49b6f4d6109ddf3a6b93f833f59483e5a1a748e4b829c4739fdaaaef59c9b583"; - name = "kcrash-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kcrash-5.76.0.tar.xz"; + sha256 = "c4e32254b22f1f02db556be2ad40000cc52cac2e30a35682af3c75ac69710993"; + name = "kcrash-5.76.0.tar.xz"; }; }; kdav = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kdav-5.73.0.tar.xz"; - sha256 = "03c8af96e7bb1b1d2d633e54c6362c7c2de078b8aba5654042b7a11d968efa31"; - name = "kdav-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kdav-5.76.0.tar.xz"; + sha256 = "c6b1d32d9c976585e278c2061091ee90ef2d7feb29642f236a3941cea5ffae72"; + name = "kdav-5.76.0.tar.xz"; }; }; kdbusaddons = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kdbusaddons-5.73.0.tar.xz"; - sha256 = "f7f7e57b4d4650cf90a191b08b1fe874d0005c34163b9177dcc787415841e8ba"; - name = "kdbusaddons-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kdbusaddons-5.76.0.tar.xz"; + sha256 = "8e11b19e4a3d4ad8e4deda245eb51b7b77255cbacc07346e7074c8110b946e0a"; + name = "kdbusaddons-5.76.0.tar.xz"; }; }; kdeclarative = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kdeclarative-5.73.0.tar.xz"; - sha256 = "713ae2ea41e1bac8f6d47cffa376d62c7805eb3e4cc41c3168c1f1b2ca70a598"; - name = "kdeclarative-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kdeclarative-5.76.0.tar.xz"; + sha256 = "3dfaa271a97be48e72d5fff0dd3c3c1995be3b9e7d0451b197b79418d76c4ce3"; + name = "kdeclarative-5.76.0.tar.xz"; }; }; kded = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kded-5.73.0.tar.xz"; - sha256 = "f21647a5f35eebaa9bf12b5d5da25c24611c1971f94f27c510d22a48c79b0895"; - name = "kded-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kded-5.76.0.tar.xz"; + sha256 = "2e94a4737ffc359d3614a1dff15b9727d54cb5fe639828946e0efcdcdbff3516"; + name = "kded-5.76.0.tar.xz"; }; }; kdelibs4support = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/portingAids/kdelibs4support-5.73.0.tar.xz"; - sha256 = "ca6f58c97b331d130a555b950c36cd7f625ca923fd185b0f73e20ac5b98c5d9b"; - name = "kdelibs4support-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/portingAids/kdelibs4support-5.76.0.tar.xz"; + sha256 = "b581273dfaebc5697eb7aa616d858119227dd6c5b781f216abdbff1d93076f0d"; + name = "kdelibs4support-5.76.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/portingAids/kdesignerplugin-5.73.0.tar.xz"; - sha256 = "379db9fd0ec135706630dbd54e1b446e51dd3b64189754c281993d761c1d20b2"; - name = "kdesignerplugin-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/portingAids/kdesignerplugin-5.76.0.tar.xz"; + sha256 = "5f9190e00761330c031310b94e195766e639115675081765050ddc55069a1b71"; + name = "kdesignerplugin-5.76.0.tar.xz"; }; }; kdesu = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kdesu-5.73.0.tar.xz"; - sha256 = "4dd07697decad6a544025178732bd279ef64766e1929a2135f6de58b1092944d"; - name = "kdesu-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kdesu-5.76.0.tar.xz"; + sha256 = "421ef43bd47c3eb6b05806af033276c19df20fd76a06b67fada529bb9c52e642"; + name = "kdesu-5.76.0.tar.xz"; }; }; kdewebkit = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/portingAids/kdewebkit-5.73.0.tar.xz"; - sha256 = "d8208c4f7a98b6749c793649e2e5fbe3939e253289a9f6b74b559f6546b34b0b"; - name = "kdewebkit-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/portingAids/kdewebkit-5.76.0.tar.xz"; + sha256 = "cf7de765c5fcad0922a1bb9376b65cfb00eb3d29a0c4ed8ef43fc363abe906ba"; + name = "kdewebkit-5.76.0.tar.xz"; }; }; kdnssd = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kdnssd-5.73.0.tar.xz"; - sha256 = "bee7f654f704d928b1219b75a289042474c1450e9f8acb02a905a4a177bc5b7d"; - name = "kdnssd-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kdnssd-5.76.0.tar.xz"; + sha256 = "9cc2979e56915b5c4d8f8e66053a41406bff46aefd65af1ab07d2b87d8f4a753"; + name = "kdnssd-5.76.0.tar.xz"; }; }; kdoctools = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kdoctools-5.73.0.tar.xz"; - sha256 = "d8dd74776d47e009d4a204d69a78428603ca99317095d7b7edca49c3d93b1b5d"; - name = "kdoctools-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kdoctools-5.76.0.tar.xz"; + sha256 = "84ea7974d741e6261e8c269750367a00375c6111dbc542e917647d0267337ae4"; + name = "kdoctools-5.76.0.tar.xz"; }; }; kemoticons = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kemoticons-5.73.0.tar.xz"; - sha256 = "0c0a26b029a8fd3d8db97bac931feb7834912aa2f7680660e98d91e868d10778"; - name = "kemoticons-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kemoticons-5.76.0.tar.xz"; + sha256 = "a50f69e62b342d6f058000ff1823569ab61d3310cb0020d848a78deaf20dff99"; + name = "kemoticons-5.76.0.tar.xz"; }; }; kfilemetadata = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kfilemetadata-5.73.0.tar.xz"; - sha256 = "1ae217aab920741e445211e20b1b60dfcf80f4a6d1864aa63321dac7c3802894"; - name = "kfilemetadata-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kfilemetadata-5.76.0.tar.xz"; + sha256 = "fa24758c93ce3df9f8ced4310dc0bf58e129b08e50f254daafa025afc9213d68"; + name = "kfilemetadata-5.76.0.tar.xz"; }; }; kglobalaccel = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kglobalaccel-5.73.0.tar.xz"; - sha256 = "0062db9adde4dab0be6b64430010c0a5653355d0d1680abc9ec8e71988ff871f"; - name = "kglobalaccel-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kglobalaccel-5.76.0.tar.xz"; + sha256 = "3a846f783ccb68da1f152fb5778612c4ed14cd79c6b5929ef729cf59e47462d4"; + name = "kglobalaccel-5.76.0.tar.xz"; }; }; kguiaddons = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kguiaddons-5.73.0.tar.xz"; - sha256 = "45b4c5e0195abd79930635bbf20886b15b1b68b13fe4c56068579b91ef147350"; - name = "kguiaddons-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kguiaddons-5.76.0.tar.xz"; + sha256 = "bdaa2ed104bfa9c2ebd702f033935a83560e1d00c7302620a6ae52cb309c7125"; + name = "kguiaddons-5.76.0.tar.xz"; }; }; kholidays = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kholidays-5.73.0.tar.xz"; - sha256 = "b0ae4b77aa7c183959bc18baa09a1a4f7208fcad2a238c1590377bf6cf8b68ab"; - name = "kholidays-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kholidays-5.76.0.tar.xz"; + sha256 = "2eeae5812b33b2527c27a137fee0d7ec66fe7164bd28afd0d2a8362f6114618b"; + name = "kholidays-5.76.0.tar.xz"; }; }; khtml = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/portingAids/khtml-5.73.0.tar.xz"; - sha256 = "378a5aaa6c796d313a63b4cf1365cdd980f2bc21e9033354f2f1317d1db9c262"; - name = "khtml-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/portingAids/khtml-5.76.0.tar.xz"; + sha256 = "163139cf9ed9c43bba9532e64ae6376e8ced9b19ea8bb8235ff91c91c4c5a3f4"; + name = "khtml-5.76.0.tar.xz"; }; }; ki18n = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/ki18n-5.73.0.tar.xz"; - sha256 = "97eef22d6cdd65c57edfe54fa9760a69005e15b7d8f4270f6185916c33e14689"; - name = "ki18n-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/ki18n-5.76.0.tar.xz"; + sha256 = "0e87bc1136e21f7860f15daa39e8d16e5a773995fce2b87b0cef0043c4ce0e7a"; + name = "ki18n-5.76.0.tar.xz"; }; }; kiconthemes = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kiconthemes-5.73.0.tar.xz"; - sha256 = "4490109a0a42675e4cd3497433e10fd4be24ef644a283edf46b308314d130356"; - name = "kiconthemes-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kiconthemes-5.76.0.tar.xz"; + sha256 = "3b3c4ab8369061418677c840963cc868dcecc2a4e57f0c73448e16a46773c7d3"; + name = "kiconthemes-5.76.0.tar.xz"; }; }; kidletime = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kidletime-5.73.0.tar.xz"; - sha256 = "52a8af3f061101c406a592ec277a2c84846e3910af1d3dbfc3e15beb9cfd24a2"; - name = "kidletime-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kidletime-5.76.0.tar.xz"; + sha256 = "0866fc98b5b045158742f03f5810909b24f1edf374a6014d476d67fe0466eb62"; + name = "kidletime-5.76.0.tar.xz"; }; }; kimageformats = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kimageformats-5.73.0.tar.xz"; - sha256 = "473d0f67d5357bbf08aa4f4504ceaceabc720b1f5433b456ddc5f8ad0d7e3b8b"; - name = "kimageformats-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kimageformats-5.76.0.tar.xz"; + sha256 = "78ced2665f8918beb617b74962d188dcbb01a92a90ba49bfd173671bdb14e68d"; + name = "kimageformats-5.76.0.tar.xz"; }; }; kinit = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kinit-5.73.0.tar.xz"; - sha256 = "0c61e90f3db83b4dc5f2438cf7880a02b600a5739cb05e5ee372aeff98b8b770"; - name = "kinit-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kinit-5.76.0.tar.xz"; + sha256 = "a5b63c10b4fc5efcbb5f92b7bce928b4a4880c0ad5d12ff12518106b09239546"; + name = "kinit-5.76.0.tar.xz"; }; }; kio = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kio-5.73.0.tar.xz"; - sha256 = "05da159e6cf5ef9aa4dd7ede86ce28a5581624a1b3f0b4718c5b7e30c4aa2a66"; - name = "kio-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kio-5.76.0.tar.xz"; + sha256 = "9351fc85c4020f2f77012e077f4f9d04d8f233e9b67f9b7619c9bc064714145b"; + name = "kio-5.76.0.tar.xz"; }; }; kirigami2 = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kirigami2-5.73.0.tar.xz"; - sha256 = "9b2a097071f77804f6f2f2a478e5db602c8b5fee00de34fc44842f31223401bb"; - name = "kirigami2-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kirigami2-5.76.0.tar.xz"; + sha256 = "90806125143807b74ee7f2fc74cd781d99b4e69ce5f15dcc28e1923f7a34a80a"; + name = "kirigami2-5.76.0.tar.xz"; }; }; kitemmodels = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kitemmodels-5.73.0.tar.xz"; - sha256 = "6569e289ac9263d87ef6641fe2f3914b9ace6814832ac9c61825b1c6805ae371"; - name = "kitemmodels-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kitemmodels-5.76.0.tar.xz"; + sha256 = "53855ccdd1105aa792914f9c88f357039bf2394af8400beaaecd9729f70e9cb0"; + name = "kitemmodels-5.76.0.tar.xz"; }; }; kitemviews = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kitemviews-5.73.0.tar.xz"; - sha256 = "ec29707d789bee58c47ee538319560a168642f69e96cacb78818825e47177727"; - name = "kitemviews-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kitemviews-5.76.0.tar.xz"; + sha256 = "b102cb67513d804fd7eed2ae20bb4ba679d38de4f236de6bc03709ff0c0bc001"; + name = "kitemviews-5.76.0.tar.xz"; }; }; kjobwidgets = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kjobwidgets-5.73.0.tar.xz"; - sha256 = "61d105c8f17dcfb85ad6c1e3bd2423ebeb430b9c290d193229bc953ac174f2bf"; - name = "kjobwidgets-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kjobwidgets-5.76.0.tar.xz"; + sha256 = "850b6af6c027476e594e6ed77ea0e531abb69ff726fce41b91e541fbee3ecedf"; + name = "kjobwidgets-5.76.0.tar.xz"; }; }; kjs = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/portingAids/kjs-5.73.0.tar.xz"; - sha256 = "97b52557212a33d59a4b3a8c34ea8a94cd5f840fb0798e770164d3cb1e755be5"; - name = "kjs-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/portingAids/kjs-5.76.0.tar.xz"; + sha256 = "829eb1308b9b07cdd07b34d80eb5e3fcf5225fa4816da19bce886add600bb62a"; + name = "kjs-5.76.0.tar.xz"; }; }; kjsembed = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/portingAids/kjsembed-5.73.0.tar.xz"; - sha256 = "cc9896930c01a6bdbfaddada9516380c9a54e5d719836f1788d8e3a74108e1d3"; - name = "kjsembed-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/portingAids/kjsembed-5.76.0.tar.xz"; + sha256 = "d7fe11b69445afe372388c5ab310d38ab69e203f3995136a948c9bbf9b8b4a88"; + name = "kjsembed-5.76.0.tar.xz"; }; }; kmediaplayer = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/portingAids/kmediaplayer-5.73.0.tar.xz"; - sha256 = "69aa3bbedfc8b9a0dd9f4ac260cded9d7b5894477bf4b5b09065d0aae8e44ab2"; - name = "kmediaplayer-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/portingAids/kmediaplayer-5.76.0.tar.xz"; + sha256 = "3185da877c2529c6e209cb382593bbb4778f80aee1b1a29b384b3f05ff99ed89"; + name = "kmediaplayer-5.76.0.tar.xz"; }; }; knewstuff = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/knewstuff-5.73.0.tar.xz"; - sha256 = "7669e62973f7e228975a07f15bb1c7f716edd81ce82d5f578a80b1f501abda1e"; - name = "knewstuff-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/knewstuff-5.76.0.tar.xz"; + sha256 = "d6589b420204d1133997f33b598324c839ec6a0db96936e2e51b7b156cafbc6b"; + name = "knewstuff-5.76.0.tar.xz"; }; }; knotifications = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/knotifications-5.73.0.tar.xz"; - sha256 = "c8e9f36716db33baca93a0386d3bb6426408eee3843eb5854bdd8ad7579f372c"; - name = "knotifications-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/knotifications-5.76.0.tar.xz"; + sha256 = "56a7daf4951b3564e244d8ba48d443e78c6d703d9d4ccc280c56d0c986de47a2"; + name = "knotifications-5.76.0.tar.xz"; }; }; knotifyconfig = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/knotifyconfig-5.73.0.tar.xz"; - sha256 = "641a167a58856e99036d44b3e7472b44cdfbbf68e5d75b9af988d0b71dc10af4"; - name = "knotifyconfig-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/knotifyconfig-5.76.0.tar.xz"; + sha256 = "9f98834a9b8135a60a5d67e7ac45229a668a889d42a14c2ca5365885acd2370e"; + name = "knotifyconfig-5.76.0.tar.xz"; }; }; kpackage = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kpackage-5.73.0.tar.xz"; - sha256 = "480b1e11733fe272d1a5680afea39bcc940f01bd3d1267be0981e3c92e098c4f"; - name = "kpackage-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kpackage-5.76.0.tar.xz"; + sha256 = "97791ef08ca18892d6aa6a50fa0a87ae72cad10de9f17e3fb503a370de829772"; + name = "kpackage-5.76.0.tar.xz"; }; }; kparts = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kparts-5.73.0.tar.xz"; - sha256 = "5546d2a474c80a601ba013642775682b087d086bd26d0b0d025b68d680c98bf2"; - name = "kparts-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kparts-5.76.0.tar.xz"; + sha256 = "c516b5c1f2bca4a109dc2d186ef6729c1ad53a242877dfe942b84f131e93412d"; + name = "kparts-5.76.0.tar.xz"; }; }; kpeople = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kpeople-5.73.0.tar.xz"; - sha256 = "9e0d3119c168f7843251c808cc149de15c1fd692062f431972023fdaa84d21c4"; - name = "kpeople-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kpeople-5.76.0.tar.xz"; + sha256 = "25c03e48a0951f2d17556912893f55750ffbc1333b07b9b42e2ff0bb571b6545"; + name = "kpeople-5.76.0.tar.xz"; }; }; kplotting = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kplotting-5.73.0.tar.xz"; - sha256 = "b5055ed9a3149c059623d88875816e9fac8d6d25d29fdfd48e0d8a16dfe01b14"; - name = "kplotting-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kplotting-5.76.0.tar.xz"; + sha256 = "536e0eb7b35700ffe91fccce37386f9b97214cd9bd41bea7f2bb333a49d7ec9e"; + name = "kplotting-5.76.0.tar.xz"; }; }; kpty = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kpty-5.73.0.tar.xz"; - sha256 = "d3bf99062589dbd1dbe302c8ed2528845f245e7f0f17ca865cdd100f7589ce9c"; - name = "kpty-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kpty-5.76.0.tar.xz"; + sha256 = "faa143bdceb02156ba2f989128376b97161c9799952a3517240816a42abe1ac7"; + name = "kpty-5.76.0.tar.xz"; }; }; kquickcharts = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kquickcharts-5.73.0.tar.xz"; - sha256 = "e37e13a5d907d872679eab38ba8e983b2fb98a11e07a3c15d32cfaad09075cfe"; - name = "kquickcharts-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kquickcharts-5.76.0.tar.xz"; + sha256 = "65e79e0b4a8f1bca579931d0c0f8345c58f27319bf332e05a32ec930b8e519c2"; + name = "kquickcharts-5.76.0.tar.xz"; }; }; kross = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/portingAids/kross-5.73.0.tar.xz"; - sha256 = "aa27b434da981f64c40985a61ee041417667844c6077c9fb52456635be67546e"; - name = "kross-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/portingAids/kross-5.76.0.tar.xz"; + sha256 = "15591f2a50f995bcaf17ef72662851c805d4644f13848387f056f686b77c5291"; + name = "kross-5.76.0.tar.xz"; }; }; krunner = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/krunner-5.73.0.tar.xz"; - sha256 = "b4e8427083b6546327eeb36b05a7e438e58f922d4cc5ae0c24cd8241924e9e09"; - name = "krunner-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/krunner-5.76.0.tar.xz"; + sha256 = "08c8addcdd3dac87472e84bd14c6d02b99f98c5efbbda7802de92286105dcdda"; + name = "krunner-5.76.0.tar.xz"; }; }; kservice = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kservice-5.73.0.tar.xz"; - sha256 = "a64bf7543870240f0d8f8c2bcf43759d98962ba94a4ed34bd23232df25bb408b"; - name = "kservice-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kservice-5.76.0.tar.xz"; + sha256 = "ef7715e5d3e0bf4fc2d28a7713913a1283fb9c658b3c3536a6db8da649d185bf"; + name = "kservice-5.76.0.tar.xz"; }; }; ktexteditor = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/ktexteditor-5.73.0.tar.xz"; - sha256 = "032b3ac31aa099ed67471f78401d13cf318646b0b9b5e20bb94796ac3ed6cf18"; - name = "ktexteditor-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/ktexteditor-5.76.0.tar.xz"; + sha256 = "6f937b7af06562a238f091deef9c4332e94311a697af8466b7f091720eaab2b2"; + name = "ktexteditor-5.76.0.tar.xz"; }; }; ktextwidgets = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/ktextwidgets-5.73.0.tar.xz"; - sha256 = "2a8b086fce8136b5b4af4a28b417343fb66148c1961e5d65bf40ccae2d4386e5"; - name = "ktextwidgets-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/ktextwidgets-5.76.0.tar.xz"; + sha256 = "a104e894cf21c245a6c22e6f2c38fdbbdb094cb7fde3d7ebff801bfd73af4c84"; + name = "ktextwidgets-5.76.0.tar.xz"; }; }; kunitconversion = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kunitconversion-5.73.0.tar.xz"; - sha256 = "97d008e8bdb2d1f89d2093294a8be0b13b0e0160658fa7d3de6c99a5fd5e2935"; - name = "kunitconversion-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kunitconversion-5.76.0.tar.xz"; + sha256 = "31fa05b082ec3a42c831b840cbc086f97c5e49c05a71af29ab35b9727320990c"; + name = "kunitconversion-5.76.0.tar.xz"; }; }; kwallet = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kwallet-5.73.0.tar.xz"; - sha256 = "4a9c8a538054fc51b30679d5180d09bb6d12a833f595a8d6875b6d4c29074de1"; - name = "kwallet-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kwallet-5.76.0.tar.xz"; + sha256 = "5addd560d3f650fbb43cd9c8c9e964c2d6893fa45ac53420b711f6bbb4e7a4fc"; + name = "kwallet-5.76.0.tar.xz"; }; }; kwayland = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kwayland-5.73.0.tar.xz"; - sha256 = "ee34a490a7bbc5e83eb36a6ac70492a76cb054d3077d0a8db216fd8b07f27bfe"; - name = "kwayland-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kwayland-5.76.0.tar.xz"; + sha256 = "eee72a5f57a2f5c6ab5f1717aa3eb5a9089240794a5e40c6d85bdc37fa3027a7"; + name = "kwayland-5.76.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kwidgetsaddons-5.73.0.tar.xz"; - sha256 = "0722d853747b85ca7d46f278dc99c28b872185406b97b811523c1aa9b5e75eb6"; - name = "kwidgetsaddons-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kwidgetsaddons-5.76.0.tar.xz"; + sha256 = "ab7aa94bb1f63e5bea5cf461349c1add96fd608a73c5b7c9d374e6bf035fcac6"; + name = "kwidgetsaddons-5.76.0.tar.xz"; }; }; kwindowsystem = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kwindowsystem-5.73.0.tar.xz"; - sha256 = "0e27ad2cd5e4699efdc02daec181b4ffb0b9e31ec4c96f0f67899804aebbcde8"; - name = "kwindowsystem-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kwindowsystem-5.76.0.tar.xz"; + sha256 = "8dced74012bed3f33c3c51874aa9c3a57093573c1c0e263b758cefa96c26f7b7"; + name = "kwindowsystem-5.76.0.tar.xz"; }; }; kxmlgui = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kxmlgui-5.73.0.tar.xz"; - sha256 = "093131f5f51497ec61e99bd3e19de9421643d3f6ddf0099a823a3d624596ebcb"; - name = "kxmlgui-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kxmlgui-5.76.0.tar.xz"; + sha256 = "73ae838fb79f97243bea36d438e9bc45315183bbb6b08ab5173c822cfcb4dd82"; + name = "kxmlgui-5.76.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/portingAids/kxmlrpcclient-5.73.0.tar.xz"; - sha256 = "c0d089c389f59bb7cb6fba629f3e122e70fda19a69f419ff8bd1d9fcee95a047"; - name = "kxmlrpcclient-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/portingAids/kxmlrpcclient-5.76.0.tar.xz"; + sha256 = "66fe826a81cd266ee57ba814cb8c7adfa00aa9112cb55714db061a82895ee8de"; + name = "kxmlrpcclient-5.76.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/modemmanager-qt-5.73.0.tar.xz"; - sha256 = "87f3864b2b53b4e309bca1feefa613455f60e4699969a569694f6813447e1fcd"; - name = "modemmanager-qt-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/modemmanager-qt-5.76.0.tar.xz"; + sha256 = "5782b71f60b825244dc017989a4de515eb9eb5cc4edfe494a14ea62d3ac40cd1"; + name = "modemmanager-qt-5.76.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/networkmanager-qt-5.73.0.tar.xz"; - sha256 = "b909feafc0a9a18b59744e0f1973c5357f67bbd50b59afa82cf55955dae7d41f"; - name = "networkmanager-qt-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/networkmanager-qt-5.76.0.tar.xz"; + sha256 = "5920862a843898ed169cc61a8f27dd87cb64dd505ec300d95ab8967da89f2f90"; + name = "networkmanager-qt-5.76.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/oxygen-icons5-5.73.0.tar.xz"; - sha256 = "662cd9644e393c69dccb538cdd4280253be812f80704c992ada228c0c32c2bbc"; - name = "oxygen-icons5-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/oxygen-icons5-5.76.0.tar.xz"; + sha256 = "95ca95bada43281d09cce000c9cd645af67592205c971052b3e0c27aef9c95b1"; + name = "oxygen-icons5-5.76.0.tar.xz"; }; }; plasma-framework = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/plasma-framework-5.73.0.tar.xz"; - sha256 = "e5415143f0a08cd75cf758b0692021d2a2febdcb1364e2aa1e5c8fbeee148c93"; - name = "plasma-framework-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/plasma-framework-5.76.0.tar.xz"; + sha256 = "5bea341bc7b22ffa6a78bf7475c25b138150314c96b3d5154d8bccc532be242a"; + name = "plasma-framework-5.76.0.tar.xz"; }; }; prison = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/prison-5.73.0.tar.xz"; - sha256 = "a2b135ffdf1af240366f3fb077c02c02094fb1706c6e84fab5186802544a5b87"; - name = "prison-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/prison-5.76.0.tar.xz"; + sha256 = "6c369efc354f8f3a0e08b0de565fd523f1480d563bec0d19382e9ab01f3efb78"; + name = "prison-5.76.0.tar.xz"; }; }; purpose = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/purpose-5.73.0.tar.xz"; - sha256 = "6f4d440cb708b636430e3206f879ca5c2e6cdfcf62f92ce173d43e291fbeed32"; - name = "purpose-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/purpose-5.76.0.tar.xz"; + sha256 = "fd0edb0e7ba8b5336436848fe2452ff98c1b5bf2c49ea7744a8c0038d4e8887d"; + name = "purpose-5.76.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/qqc2-desktop-style-5.73.0.tar.xz"; - sha256 = "290b3637be0c3740e92cdbb1421aef8bf1a8df36218f9d7d120e8422d14c3fdd"; - name = "qqc2-desktop-style-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/qqc2-desktop-style-5.76.0.tar.xz"; + sha256 = "76d2f85f6f99157aec26e6797889f1b99035a337e8aa12029c222f3d48288ef3"; + name = "qqc2-desktop-style-5.76.0.tar.xz"; }; }; solid = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/solid-5.73.0.tar.xz"; - sha256 = "7366b64438a1ca7a42126e67d352e371227b46418ce961321d358f2eb90c0933"; - name = "solid-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/solid-5.76.0.tar.xz"; + sha256 = "7958d047c8bd7622f91541acbe2d554c222218419ee18f395059a09fb90d264d"; + name = "solid-5.76.0.tar.xz"; }; }; sonnet = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/sonnet-5.73.0.tar.xz"; - sha256 = "009f76fc4317e407d30c4e162a807d620a95217f5db271a14b1f9fc4339d232c"; - name = "sonnet-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/sonnet-5.76.0.tar.xz"; + sha256 = "cb6bacae27cfa3f8b3ce300b18efe16730783f143c4a7fccfa634f528262ef9b"; + name = "sonnet-5.76.0.tar.xz"; }; }; syndication = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/syndication-5.73.0.tar.xz"; - sha256 = "2a65972ef5183edb0bd8b3804dae129ae8f4a4469287711e77fc636e90b8a954"; - name = "syndication-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/syndication-5.76.0.tar.xz"; + sha256 = "239ec30ff8f7ad2911ecc6b9b9c32f2b44c6cad634900105936ae56bf96d6292"; + name = "syndication-5.76.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/syntax-highlighting-5.73.0.tar.xz"; - sha256 = "51ed4a68ba42d0dc88d91a0c11ac55ada199b7e93b0ff74b80b5e9304fe8901b"; - name = "syntax-highlighting-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/syntax-highlighting-5.76.0.tar.xz"; + sha256 = "3cb61a8c478b76f797db53ed9e8a16c6e70bb1c564f05938680db81c3062bab3"; + name = "syntax-highlighting-5.76.0.tar.xz"; }; }; threadweaver = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/threadweaver-5.73.0.tar.xz"; - sha256 = "7e1152a1cf73f841c3be5d73cb0d5e6e29ec700be859c94275c5c00e49488d38"; - name = "threadweaver-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/threadweaver-5.76.0.tar.xz"; + sha256 = "8bc0cc4507b4cd7398e18cce8519b4a65b0367e7d22c4faae034a57346297039"; + name = "threadweaver-5.76.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kquickimageedit/default.nix b/pkgs/development/libraries/kquickimageedit/default.nix new file mode 100644 index 0000000000000..f7cac0c037265 --- /dev/null +++ b/pkgs/development/libraries/kquickimageedit/default.nix @@ -0,0 +1,19 @@ +{ mkDerivation +, fetchFromGitLab +, extra-cmake-modules +}: + +mkDerivation rec { + pname = "kquickimageeditor"; + version = "0.1.2"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "libraries"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-4X3GO/NPzA3c9KiGIkznLHUjLfNNNnPXif7IFwY5dOM="; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; +} diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/development/libraries/libabigail/default.nix index 168ce0c9e5718..54dbb349eb6da 100644 --- a/pkgs/development/libraries/libabigail/default.nix +++ b/pkgs/development/libraries/libabigail/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libabigail"; - version = "1.7"; + version = "1.8"; outputs = [ "bin" "out" "dev" ]; src = fetchurl { url = "https://mirrors.kernel.org/sourceware/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0bf8w01l6wm7mm4clfg5rqi30m1ws11qqa4bp2vxghfwgi9ai8i7"; + sha256 = "0p363mkgypcklgf8iylxpbdnfgqc086a6fv7n9hzrjjci45jdgqw"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix index 829d16e59d06f..df1558a1e49a4 100644 --- a/pkgs/development/libraries/libcryptui/default.nix +++ b/pkgs/development/libraries/libcryptui/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 gnupg22 gpgme dbus-glib libgnome-keyring ]; propagatedBuildInputs = [ dbus-glib ]; + enableParallelBuilding = true; + passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix index 35707834c086b..b571e816fc40c 100644 --- a/pkgs/development/libraries/libctemplate/default.nix +++ b/pkgs/development/libraries/libctemplate/default.nix @@ -1,21 +1,26 @@ -{ stdenv, fetchurl, python2 }: +{ stdenv, fetchFromGitHub, python3, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "ctemplate"; + version = "2.4"; - version = "2.3"; - - src = fetchurl { - url = "https://github.com/OlafvdSpek/ctemplate/archive/ctemplate-${version}.tar.gz"; - sha256 = "0mi5g2xlws10z1g4x0cj6kd1r673kkav35pgzyqxa1w47xnwprcr"; + src = fetchFromGitHub { + owner = "OlafvdSpek"; + repo = "ctemplate"; + rev = "ctemplate-${version}"; + sha256 = "1x0p5yym6vvcx70pm8ihnbxxrl2wnblfp72ih5vjyg8mzkc8cxrr"; }; - buildInputs = [ python2 ]; + nativeBuildInputs = [ python3 autoconf automake libtool ]; postPatch = '' patchShebangs . ''; + preConfigure = '' + ./autogen.sh + ''; + meta = { description = "A simple but powerful template language for C++"; longDescription = '' diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 469633afb10cd..4984d95ffa4e3 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.90.4"; + version = "1.90.5"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "0grhck0h29i7hm7npvby7pn7wdc446kv0r4mkpbssp46lqbjb96b"; + sha256 = "1wfwka2ik4hbb5wk5dp533040sqygwswg91c3v5fvpmmixh5qx9j"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 21f9833a5d56a..7d7f035f77f16 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://www.linphone.org/technical-corner/liblinphone"; description = "Library for SIP calls and instant messaging"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix index 90016b09c7384..54ff0dccb90ee 100644 --- a/pkgs/development/libraries/libmesode/default.nix +++ b/pkgs/development/libraries/libmesode/default.nix @@ -1,32 +1,32 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libtool, openssl, expat, pkgconfig, check }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, libtool +, openssl +, expat +, pkg-config +, check +}: stdenv.mkDerivation rec { pname = "libmesode"; - version = "0.9.3"; + version = "0.10.1"; src = fetchFromGitHub { - owner = "boothj5"; + owner = "profanity-im"; repo = "libmesode"; rev = version; - sha256 = "0xzfg1xx88cn36352nnjlb1p7xyw32yqkhjzq10px88iaaqz1vv0"; + sha256 = "1bxnkhrypgv41qyy1n545kcggmlw1hvxnhwihijhhcf2pxd2s654"; }; - patches = [ - (fetchpatch { - name = "fix-ssl-certificate-verification.diff"; - url = "https://github.com/profanity-im/libmesode/commit/532ed1e9d3e71e5bea0752e03dbacd4139d750d1.diff"; - sha256 = "140jp7xzskik0sb6aqjsw7z477a124cxl7dkm80m2nyzjng4pzg5"; - }) - ]; - - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl expat libtool check ]; dontDisableStatic = true; doCheck = true; - meta = { + meta = with stdenv.lib; { description = "Fork of libstrophe (https://github.com/strophe/libstrophe) for use with Profanity XMPP Client"; longDescription = '' Reasons for forking: @@ -39,9 +39,10 @@ stdenv.mkDerivation rec { Whilst Profanity will run against libstrophe, libmesode provides extra TLS functionality such as manual SSL certificate verification. ''; - homepage = "https://github.com/boothj5/libmesode/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.devhell ]; + homepage = "https://github.com/profanity-im/libmesode/"; + license = with licenses; [ gpl3Only mit]; + platforms = platforms.unix; + broken = stdenv.isDarwin; + maintainers = with maintainers; [ devhell ]; }; } diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix index f79bc104fc8be..a0d32f5178a9b 100644 --- a/pkgs/development/libraries/libmodulemd/default.nix +++ b/pkgs/development/libraries/libmodulemd/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fedora-modularity/libmodulemd"; license = licenses.mit; maintainers = with maintainers; [ ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin ; }; } diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index d2333ac0ca59e..e7b01ca29cb16 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -16,13 +16,14 @@ }: stdenv.mkDerivation rec { - name = "libnice-0.1.16"; + pname = "libnice"; + version = "0.1.18"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { - url = "https://nice.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "1pzgxq0qrqlrhd78qnvpfgp8bl5c4znqh599ljaybpcldw37idh6"; + url = "https://libnice.freedesktop.org/releases/${pname}-${version}.tar.gz"; + sha256 = "1x3kj9b3dy9m2h6j96wgywfamas1j8k2ca43k5v82kmml9dx5asy"; }; patches = [ @@ -77,7 +78,7 @@ stdenv.mkDerivation rec { It provides a GLib-based library, libnice and a Glib-free library, libstun as well as GStreamer elements.''; - homepage = "https://nice.freedesktop.org/wiki/"; + homepage = "https://libnice.freedesktop.org/"; platforms = platforms.linux; license = with licenses; [ lgpl21 mpl11 ]; }; diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/development/libraries/libow/default.nix index 1f67e1fc791b7..d7e83e7a9e3de 100644 --- a/pkgs/development/libraries/libow/default.nix +++ b/pkgs/development/libraries/libow/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, libtool }: stdenv.mkDerivation rec { - version = "3.2p3"; + version = "3.2p4"; pname = "libow"; src = fetchFromGitHub { owner = "owfs"; repo = "owfs"; rev = "v${version}"; - sha256 = "02l3r4ixhicph5iqxdjanck2gbqkfs9vnnac112bzlvlw3x9r03m"; + sha256 = "0dln1ar7bxwhpi36sccmpwapy7iz4j097rbf02mgn42lw5vrcg3s"; }; nativeBuildInputs = [ autoconf automake pkgconfig ]; diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix index bbe0b61455038..664b8d1a7e0db 100644 --- a/pkgs/development/libraries/libraspberrypi/default.nix +++ b/pkgs/development/libraries/libraspberrypi/default.nix @@ -1,25 +1,40 @@ -{ stdenv, cmake, fetchFromGitHub }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +}: stdenv.mkDerivation rec { - name = "libraspberrypi"; - version = "2020-05-28"; + pname = "libraspberrypi"; + version = "unstable-2020-11-30"; + src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "f97b1af1b3e653f9da2c1a3643479bfd469e3b74"; - sha256 = "1r7n05rv96hqjq0rn0qzchmfqs0j7vh3p8jalgh66s6l0vms5mwy"; + rev = "093b30bbc2fd083d68cc3ee07e6e555c6e592d11"; + sha256 = "0n2psqyxlsic9cc5s8h65g0blblw3xws4czhpbbgjm58px3822d7"; }; - cmakeFlags = if (stdenv.targetPlatform.system == "aarch64-linux") - then "-DARM64=ON" - else "-DARM64=OFF"; - preConfigure = ''cmakeFlags="$cmakeFlags -DVMCS_INSTALL_PREFIX=$out"''; - nativeBuildInputs = [ cmake ]; + patches = [ + (fetchpatch { + # https://github.com/raspberrypi/userland/pull/670 + url = "https://github.com/raspberrypi/userland/pull/670/commits/37cb44f314ab1209fe2a0a2449ef78893b1e5f62.patch"; + sha256 = "1fbrbkpc4cc010ji8z4ll63g17n6jl67kdy62m74bhlxn72gg9rw"; + }) + ]; + + nativeBuildInputs = [ cmake pkg-config ]; + cmakeFlags = [ + (if (stdenv.hostPlatform.isAarch64) then "-DARM64=ON" else "-DARM64=OFF") + "-DVMCS_INSTALL_PREFIX=${placeholder "out"}" + ]; + meta = with stdenv.lib; { - description = "Userland libraries for interfacing with Raspberry Pi hardware"; + description = "Userland tools & libraries for interfacing with Raspberry Pi hardware"; homepage = "https://github.com/raspberrypi/userland"; license = licenses.bsd3; - platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ tkerber ]; + platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ dezgeg tavyc tkerber ]; }; } diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index ab1df8d2bc129..a0414f5ba55f2 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # src input for buildPythonPackage calls postInstall = '' cp -R ./src/python/ tmp-pythonsrc/ - tar -zcf $pythonsrc --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/ + tar -zcf $pythonsrc --mtime="@$SOURCE_DATE_EPOCH" --sort=name --transform s/tmp-pythonsrc/python-foundationdb/ ./tmp-pythonsrc/ ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libsmartcols/default.nix b/pkgs/development/libraries/libsmartcols/default.nix new file mode 100644 index 0000000000000..bb3de08cf72e9 --- /dev/null +++ b/pkgs/development/libraries/libsmartcols/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python3 }: + +stdenv.mkDerivation rec { + name = "libsmartcols"; + version = "v2.36.1"; + + nativeBuildInputs = [ autoreconfHook pkgconfig python3 ]; + + src = fetchFromGitHub { + owner = "karelzak"; + repo = "util-linux"; + rev = version; + sha256 = "0z7nv054pqhlihqiw0vk3h40j0cxk1yxf8zzh0ddmvk6834cnyxs"; + }; + + configureFlags = [ "--disable-all-programs" "--enable-libsmartcols" ]; + + buildPhase = '' + make libsmartcols.la + ''; + + installTargets = [ "install-am" "install-pkgconfigDATA" ]; + + meta = { + description = "smart column output alignment library"; + homepage = https://github.com/karelzak/util-linux/tree/master/libsmartcols; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ rb2k ]; + }; +} + diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 65ab87a0cf657..d75d9cc07805f 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "A free package dependency solver"; homepage = "https://github.com/openSUSE/libsolv"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.1/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix index b2c958795f3e3..b2c958795f3e3 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.1/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix index 1233dcb393349..9a165780b7e25 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix @@ -3,8 +3,7 @@ }: let - version = "1.2.6"; - formattedVersion = stdenv.lib.replaceChars ["."] ["_"] version; + version = "1.2.11"; # Make sure we override python, so the correct version is chosen # for the bindings, if overridden @@ -17,8 +16,8 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "arvidn"; repo = "libtorrent"; - rev = "libtorrent-${formattedVersion}"; - sha256 = "140gc9j6lymy5kr0gviqznpg4hl57rz2q6vpb9sjkkimr19lrvdr"; + rev = "v${version}"; + sha256 = "05qm8mcyxsnb6zb8nckln1gkk8ncwzfhsz7d7p3fhx6gdsc8j71b"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix new file mode 100644 index 0000000000000..e9c59ed97e828 --- /dev/null +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, cmake +, zlib, boost, openssl, python, ncurses, SystemConfiguration +}: + +let + version = "2.0.1"; + + # Make sure we override python, so the correct version is chosen + boostPython = boost.override { enablePython = true; inherit python; }; + +in stdenv.mkDerivation { + pname = "libtorrent-rasterbar"; + inherit version; + + src = fetchFromGitHub { + owner = "arvidn"; + repo = "libtorrent"; + rev = "v${version}"; + sha256 = "04ppw901babkfkis89pyb8kiyn39kb21k1s838xjq5ghbral1b1c"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ boostPython openssl zlib python ncurses ] + ++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + + postInstall = '' + moveToOutput "include" "$dev" + moveToOutput "lib/${python.libPrefix}" "$python" + ''; + + outputs = [ "out" "dev" "python" ]; + + cmakeFlags = [ + "-Dpython-bindings=on" + ]; + + meta = with stdenv.lib; { + homepage = "https://libtorrent.org/"; + description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; + license = licenses.bsd3; + maintainers = [ maintainers.phreedom ]; + broken = stdenv.isDarwin; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index c91105d2bf86c..10310e22da7be 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -13,13 +13,13 @@ assert enableUdev -> udev != null; stdenv.mkDerivation rec { pname = "libusb"; - version = "1.0.23"; + version = "1.0.24"; src = fetchFromGitHub { owner = "libusb"; repo = "libusb"; rev = "v${version}"; - sha256 = "0mxbpg01kgbk5nh6524b0m4xk7ywkyzmc3yhi5asqcsd3rbhjj98"; + sha256 = "18ri8ky422hw64zry7bpbarb1m0hiljyf64a0a9y093y7aad38i7"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index 66294848b1999..f860c328fe7af 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.9.1"; + version = "2.10.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "1viqxq9r424hvbfgjlw4zb1idsq24fqr5cz6rk47j37rcnqclj2k"; + sha256 = "14v4mw0asjgg4l0683hn87d8jai8lrmcpbfcm9z93p4mpn2sp7aw"; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/development/libraries/libzra/default.nix b/pkgs/development/libraries/libzra/default.nix new file mode 100644 index 0000000000000..b5fe6e593566f --- /dev/null +++ b/pkgs/development/libraries/libzra/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "libzra"; + version = "unstable-2020-08-10"; + + src = fetchFromGitHub { + owner = "zraorg"; + repo = "zra"; + rev = "e678980ae7e79efd716b4a6610fe9f148425fd6b"; + sha256 = "132xyzhadahm01nas8gycjza5hs839fnpsh73im2a7wwfdw76z4h"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/zraorg/ZRA"; + description = "Library for ZStandard random access"; + platforms = platforms.all; + maintainers = [ maintainers.ivar ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index ef1cef84df5f0..17dc93c9f1ea9 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -15,7 +15,7 @@ let # It will rebuild itself using the version of this package (NSS) and if # an update is required do the required changes to the expression. # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert - version = "3.59"; + version = "3.60"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "096fs3z21r171q24ca3rq53p1389xmvqz1f2rpm7nlm8r9s82ag6"; + sha256 = "0ggyj3ax3kal65sl1vl4nfhx2s08blg4dg8iwlxcax5qb9bxbaw4"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/development/libraries/ntirpc/default.nix index 6654cc563d1a7..48ef98dab499a 100644 --- a/pkgs/development/libraries/ntirpc/default.nix +++ b/pkgs/development/libraries/ntirpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ntirpc"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "ntirpc"; rev = "v${version}"; - sha256 = "08vc2z9sl1p9mk1mx0zn4xv7dw12gamhciy41fbavm90iavf3vqm"; + sha256 = "1xdwqyc9m4lbsgr7ll1g0f84c2h8jrfkg67cgvsp424i1a7r9mm1"; }; postPatch = '' diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index 3fac1421899a8..b0a9227b8c939 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, icu, catch2, pandoc }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, icu, catch2, pandoc }: stdenv.mkDerivation rec { pname = "nuspell"; - version = "4.0.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "1p90a3wv4b8m5fdpbnr9cyd1x3a504q9rc4cghq02xff63h5gclf"; + sha256 = "sha256-sQ3Q2+FOf2bXCKcgd6XvEb+QZzzDccs/4+CpJbEd1PQ="; }; nativeBuildInputs = [ cmake pkgconfig pandoc ]; - buildInputs = [ boost icu ]; + buildInputs = [ icu ]; outputs = [ "out" "lib" "dev" "man" ]; @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free and open source C++ spell checking library"; homepage = "https://nuspell.github.io/"; + platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; license = licenses.lgpl3Plus; }; diff --git a/pkgs/development/libraries/oatpp/default.nix b/pkgs/development/libraries/oatpp/default.nix new file mode 100644 index 0000000000000..38c021707615a --- /dev/null +++ b/pkgs/development/libraries/oatpp/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "oatpp"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "oatpp"; + repo = "oatpp"; + rev = version; + sha256 = "05rm0m5zf1b5ky8prf6yni2074bz6yjjbrc2qk96fb48fc1198gw"; + }; + + nativeBuildInputs = [ cmake ]; + + # Tests fail on darwin. See https://github.com/NixOS/nixpkgs/pull/105419#issuecomment-735826894 + doCheck = !stdenv.isDarwin; + + meta = with stdenv.lib; { + homepage = "https://oatpp.io/"; + description = "Light and powerful C++ web framework for highly scalable and resource-efficient web applications"; + license = licenses.asl20; + maintainers = [ maintainers.ivar ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index a723ded6bb690..c6547f118d066 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -162,15 +162,11 @@ stdenv.mkDerivation { # This prevents cmake from using libraries in impure paths (which # causes build failure on non NixOS) - # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with - # what appears to be some stray headers in dnn/misc/tensorflow - # in contrib when generating the Python bindings: patches = [ ./cmake-don-t-use-OpenCVFindOpenEXR.patch ] ++ lib.optional enableCuda ./cuda_opt_flow.patch; postPatch = '' sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt - sed -i -e 's|if len(decls) == 0:|if len(decls) == 0 or "opencv2/" not in hdr:|' ./modules/python/src2/gen2.py ''; preConfigure = diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index c4a9a4a018087..fcd12ba587d04 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.1h"; - sha256 = "1ncmcnh5bmxkwrvm0m1q4kdcjjfpwvlyjspjhibkxc6p9dvsi72w"; + version = "1.1.1i"; + sha256 = "0hjj1phcwkz69lx1lrvr9grhpl4y529mwqycqc1hdla1zqsnmgp8"; 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 f84f3ab1d83ed..ecd15498432c2 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Real-Time Transport Protocol (RFC3550) stack"; homepage = "https://linphone.org/technical-corner/ortp"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index 12def747361b5..e9c5301aac56c 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "1.1"; src = fetchFromGitHub { - owner = "rhdunn"; + owner = "espeak-ng"; repo = "pcaudiolib"; rev = version; sha256 = "0c55hlqqh0m7bcb3nlgv1s4a22s5bgczr1cakjh3767rjb10khi0"; @@ -16,15 +16,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake which libtool pkgconfig ]; - buildInputs = [ portaudio alsaLib ] ++ lib.optional pulseaudioSupport libpulseaudio; + buildInputs = [ portaudio ] + ++ lib.optionals stdenv.isLinux [ alsaLib ] + ++ lib.optionals pulseaudioSupport [ libpulseaudio ]; preConfigure = "./autogen.sh"; meta = with stdenv.lib; { description = "Provides a C API to different audio devices"; - homepage = "https://github.com/rhdunn/pcaudiolib"; + homepage = "https://github.com/espeak-ng/pcaudiolib"; license = licenses.gpl3; maintainers = with maintainers; [ aske ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index 66f2d433ee3eb..160f2f64cf40b 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, doxygen +{ stdenv, fetchurl, cmake, doxygen, darwin , zlib }: let @@ -14,7 +14,8 @@ let nativeBuildInputs = [ cmake doxygen ]; - buildInputs = [ zlib ]; + buildInputs = [ zlib ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; enableParallelBuilding = true; @@ -32,7 +33,7 @@ let homepage = "http://icculus.org/physfs/"; description = "Library to provide abstract access to various archives"; license = licenses.free; - platforms = platforms.linux; + platforms = platforms.unix; }; }; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index d07c77f4e2eb4..c9697ee1a424d 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -24,7 +24,7 @@ , nixosTests , gstreamerSupport ? true, gst_all_1 ? null , ffmpegSupport ? true, ffmpeg ? null -, bluezSupport ? true, bluez ? null, sbc ? null +, bluezSupport ? true, bluez ? null, sbc ? null, libopenaptx ? null, ldacbt ? null , nativeHspSupport ? true , ofonoSupport ? true , hsphfpdSupport ? true @@ -39,7 +39,7 @@ let in stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.17"; + version = "0.3.18"; outputs = [ "out" @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "1gzdahji23fsgjycc08h7zzv8filmzdrkyvpkljc881l4cb5l58n"; + sha256 = "1yghhgs18yqrnd0b2r75l5n8yng962r1wszbsi01v6i9zib3jc9g"; }; patches = [ @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { systemd ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] ++ lib.optional ffmpegSupport ffmpeg - ++ lib.optionals bluezSupport [ bluez sbc ]; + ++ lib.optionals bluezSupport [ bluez libopenaptx ldacbt sbc ]; mesonFlags = [ "-Ddocs=true" diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix index 60215c9531c2a..f68833bdac4d1 100644 --- a/pkgs/development/libraries/pmix/default.nix +++ b/pkgs/development/libraries/pmix/default.nix @@ -3,7 +3,7 @@ } : let - version = "3.2.1"; + version = "3.2.2"; in stdenv.mkDerivation { pname = "pmix"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { repo = "openpmix"; owner = "openpmix"; rev = "v${version}"; - sha256 = "0c9q9a18kdilj6ddqlsvalyv4js79qvslnccn79xl2gl3wm3lyzh"; + sha256 = "1rf82z7h76366qknkmralmslsfmihv0r3ymhbgk1axq97ic3g4d7"; }; postPatch = '' diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index a51db09db8602..f1c93e0fa7c71 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation { }; patches = [(fetchpatch { - name = "ppl.patch"; - url = "http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=patch;h=c39f6a07b51f89e365b05ba4147aa2aa448febd7"; + name = "clang5-support.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ppl/patches/clang5-support.patch?h=9.2"; sha256 = "1zj90hm25pkgvk4jlkfzh18ak9b98217gbidl3731fdccbw6hr87"; })]; diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index 90d4cb45ce2a8..b941021cb688c 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { "BLAS=-L${blas}/lib -lblas" "PREFIX=${placeholder "out"}" ${stdenv.lib.optionalString blas.isILP64 - # Use their FFLAGS along with `-fdefault-integer-8`. If another - # application intends to use arpack, it should add this to it's FFLAGS as - # well. Otherwise (e.g): https://savannah.gnu.org/bugs/?50339 - "FFLAGS=-fimplicit-none -O3 -funroll-loops -fdefault-integer-8" + # If another application intends to use qrupdate compiled with blas with + # 64 bit support, it should add this to it's FFLAGS as well. See (e.g): + # https://savannah.gnu.org/bugs/?50339 + "FFLAGS=-fdefault-integer-8" } ) ''; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index b4486bf025d73..2712b45bdd252 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -57,6 +57,12 @@ let # Downgrade minimal required SDK to 10.12 ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch + ./qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch + ./qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch + ./qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch + ./qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch + ./qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch + ./qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch ./qtbase.patch.d/qtbase-sdk-10.12-mac.patch # Patch framework detection to support X.framework/X.tbd, @@ -77,16 +83,7 @@ let qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; - qtwebengine = [ - # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599 - (fetchpatch { - name = "qtwebengine-bison-3.7-build.patch"; - url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599"; - sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy"; - stripLen = 1; - extraPrefix = "src/3rdparty/"; - }) - ] + qtwebengine = [ ] ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ (fetchpatch { diff --git a/pkgs/development/libraries/qt-5/5.15/fetch.sh b/pkgs/development/libraries/qt-5/5.15/fetch.sh index 97829a133ca50..70e6dbe82a3b2 100644 --- a/pkgs/development/libraries/qt-5/5.15/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.15/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/ ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch new file mode 100644 index 0000000000000..de75ecbd0c17c --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0001-Revert-QCocoaDrag-set-image-only-on-the-first-drag-i.patch @@ -0,0 +1,47 @@ +From f156c35975e7844d2369ec5a6633ee40ec56f17a Mon Sep 17 00:00:00 2001 +From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> +Date: Mon, 7 Dec 2020 12:32:29 -0500 +Subject: [PATCH 1/6] Revert "QCocoaDrag - set image only on the first drag + item" + +This reverts commit 7ee9bfc158a290776f622f62d0202220c6d159bc. +--- + src/plugins/platforms/cocoa/qcocoadrag.mm | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm +index 4bd1b129bd..a506126c72 100644 +--- a/src/plugins/platforms/cocoa/qcocoadrag.mm ++++ b/src/plugins/platforms/cocoa/qcocoadrag.mm +@@ -217,18 +217,13 @@ bool QCocoaDrag::maybeDragMultipleItems() + // 0. We start from URLs, which can be actually in a list (thus technically + // only ONE item in the pasteboard. The fact it's only one does not help, we are + // still getting an exception because of the number of items/images mismatch ... +- // We only set the image for the first item and nil for the rest, the image already +- // contains a combined picture for all urls we drag. +- auto imageOrNil = dragImage; + for (const auto &qtUrl : qtUrls) { + NSURL *nsUrl = qtUrl.toNSURL(); + auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:nsUrl] autorelease]; + const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y, + dragImage.size.width, + dragImage.size.height); +- +- [newItem setDraggingFrame:itemFrame contents:imageOrNil]; +- imageOrNil = nil; ++ [newItem setDraggingFrame:itemFrame contents:dragImage]; + [dragItems addObject:newItem]; + } + // 1. Repeat for non-url items, if any: +@@ -237,7 +232,7 @@ bool QCocoaDrag::maybeDragMultipleItems() + const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y, + dragImage.size.width, + dragImage.size.height); +- [newItem setDraggingFrame:itemFrame contents:imageOrNil]; ++ [newItem setDraggingFrame:itemFrame contents:dragImage]; + [dragItems addObject:newItem]; + } + +-- +2.21.0 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch new file mode 100644 index 0000000000000..ee3a2d9f5a4d5 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0002-Revert-QCocoaDrag-drag-make-sure-clipboard-is-ours-a.patch @@ -0,0 +1,40 @@ +From 9aaac67e3c3bf40ef3efc3b07b1655f72c8c54aa Mon Sep 17 00:00:00 2001 +From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> +Date: Mon, 7 Dec 2020 12:32:31 -0500 +Subject: [PATCH 2/6] Revert "QCocoaDrag::drag - make sure clipboard is ours + and populated" + +This reverts commit 720e2e0c92ca6635c5f05f318770a70cf653c1c7. +--- + src/plugins/platforms/cocoa/qcocoadrag.mm | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm +index a506126c72..c6ee4323ce 100644 +--- a/src/plugins/platforms/cocoa/qcocoadrag.mm ++++ b/src/plugins/platforms/cocoa/qcocoadrag.mm +@@ -131,10 +131,6 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) + m_drag = o; + m_executed_drop_action = Qt::IgnoreAction; + +- QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND); +- m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy")); +- dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest); +- + if (maybeDragMultipleItems()) + return m_executed_drop_action; + +@@ -143,6 +139,10 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) + NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()]; + Q_ASSERT(dragImage); + ++ QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND); ++ m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy")); ++ dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest); ++ + NSPoint event_location = [m_lastEvent locationInWindow]; + NSWindow *theWindow = [m_lastEvent window]; + Q_ASSERT(theWindow); +-- +2.21.0 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch new file mode 100644 index 0000000000000..55211fca64c7a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0003-Revert-QCocoaDrag-maybeDragMultipleItems-fix-erroneo.patch @@ -0,0 +1,27 @@ +From d1626c55d10537274c6f365855342a1c619a4c3a Mon Sep 17 00:00:00 2001 +From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> +Date: Mon, 7 Dec 2020 12:32:32 -0500 +Subject: [PATCH 3/6] Revert "QCocoaDrag::maybeDragMultipleItems - fix + erroneous size check" + +This reverts commit b8a03411784803c07ecc1f769860756d6fdc04cd. +--- + src/plugins/platforms/cocoa/qcocoadrag.mm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm +index c6ee4323ce..ab6863a432 100644 +--- a/src/plugins/platforms/cocoa/qcocoadrag.mm ++++ b/src/plugins/platforms/cocoa/qcocoadrag.mm +@@ -187,7 +187,7 @@ bool QCocoaDrag::maybeDragMultipleItems() + const auto &qtUrls = m_drag->mimeData()->urls(); + NSPasteboard *dragBoard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag]; + +- if (qtUrls.size() <= 1) { ++ if (int(dragBoard.pasteboardItems.count) == 1 && qtUrls.size() <= 1) { + // Good old -dragImage: works perfectly for this ... + return false; + } +-- +2.21.0 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch new file mode 100644 index 0000000000000..7b568a91943f9 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch @@ -0,0 +1,192 @@ +From d5c155a9f3ff38e28ac073f6df43175724ebc290 Mon Sep 17 00:00:00 2001 +From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> +Date: Mon, 7 Dec 2020 12:32:34 -0500 +Subject: [PATCH 4/6] Revert "QCocoaDrag - avoid using the deprecated API if + possible" + +This reverts commit 8481a9fc974a1f1dd44a9f82decb18fe2290689f. +--- + src/plugins/platforms/cocoa/qcocoadrag.h | 6 -- + src/plugins/platforms/cocoa/qcocoadrag.mm | 90 ------------------- + .../platforms/cocoa/qnsview_dragging.mm | 9 +- + 3 files changed, 1 insertion(+), 104 deletions(-) + +diff --git a/src/plugins/platforms/cocoa/qcocoadrag.h b/src/plugins/platforms/cocoa/qcocoadrag.h +index 975741c270..5a5b985c6e 100644 +--- a/src/plugins/platforms/cocoa/qcocoadrag.h ++++ b/src/plugins/platforms/cocoa/qcocoadrag.h +@@ -48,8 +48,6 @@ + #include <QtGui/private/qdnd_p.h> + #include <QtGui/private/qinternalmimedata_p.h> + +-#include <QtCore/qeventloop.h> +- + QT_BEGIN_NAMESPACE + + class QCocoaDrag : public QPlatformDrag +@@ -71,15 +69,11 @@ public: + void setLastMouseEvent(NSEvent *event, NSView *view); + + void setAcceptedAction(Qt::DropAction act); +- void exitDragLoop(); + private: + QDrag *m_drag; + NSEvent *m_lastEvent; + NSView *m_lastView; + Qt::DropAction m_executed_drop_action; +- QEventLoop internalDragLoop; +- +- bool maybeDragMultipleItems(); + + QPixmap dragPixmap(QDrag *drag, QPoint &hotSpot) const; + }; +diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm +index ab6863a432..b4a16ab912 100644 +--- a/src/plugins/platforms/cocoa/qcocoadrag.mm ++++ b/src/plugins/platforms/cocoa/qcocoadrag.mm +@@ -44,9 +44,6 @@ + #include <QtWidgets/qwidget.h> + #endif + #include <QtGui/private/qcoregraphics_p.h> +-#include <QtCore/qsysinfo.h> +- +-#include <vector> + + QT_BEGIN_NAMESPACE + +@@ -131,9 +128,6 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) + m_drag = o; + m_executed_drop_action = Qt::IgnoreAction; + +- if (maybeDragMultipleItems()) +- return m_executed_drop_action; +- + QPoint hotSpot = m_drag->hotSpot(); + QPixmap pm = dragPixmap(m_drag, hotSpot); + NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()]; +@@ -164,95 +158,11 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o) + return m_executed_drop_action; + } + +-bool QCocoaDrag::maybeDragMultipleItems() +-{ +- Q_ASSERT(m_drag && m_drag->mimeData()); +- Q_ASSERT(m_executed_drop_action == Qt::IgnoreAction); +- +- if (QOperatingSystemVersion::current() < QOperatingSystemVersion::MacOSMojave) { +- // -dragImage: stopped working in 10.14 first. +- return false; +- } +- +- const QMacAutoReleasePool pool; +- +- NSWindow *theWindow = [m_lastEvent window]; +- Q_ASSERT(theWindow); +- +- if (![theWindow.contentView respondsToSelector:@selector(draggingSession:sourceOperationMaskForDraggingContext:)]) +- return false; +- +- auto *sourceView = static_cast<NSView<NSDraggingSource>*>(theWindow.contentView); +- +- const auto &qtUrls = m_drag->mimeData()->urls(); +- NSPasteboard *dragBoard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag]; +- +- if (int(dragBoard.pasteboardItems.count) == 1 && qtUrls.size() <= 1) { +- // Good old -dragImage: works perfectly for this ... +- return false; +- } +- +- std::vector<NSPasteboardItem *> nonUrls; +- for (NSPasteboardItem *item in dragBoard.pasteboardItems) { +- bool isUrl = false; +- for (NSPasteboardType type in item.types) { +- using NSStringRef = NSString *; +- if ([type isEqualToString:NSStringRef(kUTTypeFileURL)]) { +- isUrl = true; +- break; +- } +- } +- +- if (!isUrl) +- nonUrls.push_back(item); +- } +- +- QPoint hotSpot = m_drag->hotSpot(); +- const auto pixmap = dragPixmap(m_drag, hotSpot); +- NSImage *dragImage = [NSImage imageFromQImage:pixmap.toImage()]; +- Q_ASSERT(dragImage); +- +- NSMutableArray<NSDraggingItem *> *dragItems = [[[NSMutableArray alloc] init] autorelease]; +- const NSPoint itemLocation = m_drag->hotSpot().toCGPoint(); +- // 0. We start from URLs, which can be actually in a list (thus technically +- // only ONE item in the pasteboard. The fact it's only one does not help, we are +- // still getting an exception because of the number of items/images mismatch ... +- for (const auto &qtUrl : qtUrls) { +- NSURL *nsUrl = qtUrl.toNSURL(); +- auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:nsUrl] autorelease]; +- const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y, +- dragImage.size.width, +- dragImage.size.height); +- [newItem setDraggingFrame:itemFrame contents:dragImage]; +- [dragItems addObject:newItem]; +- } +- // 1. Repeat for non-url items, if any: +- for (auto *pbItem : nonUrls) { +- auto *newItem = [[[NSDraggingItem alloc] initWithPasteboardWriter:pbItem] autorelease]; +- const NSRect itemFrame = NSMakeRect(itemLocation.x, itemLocation.y, +- dragImage.size.width, +- dragImage.size.height); +- [newItem setDraggingFrame:itemFrame contents:dragImage]; +- [dragItems addObject:newItem]; +- } +- +- [sourceView beginDraggingSessionWithItems:dragItems event:m_lastEvent source:sourceView]; +- internalDragLoop.exec(); +- return true; +-} +- + void QCocoaDrag::setAcceptedAction(Qt::DropAction act) + { + m_executed_drop_action = act; + } + +-void QCocoaDrag::exitDragLoop() +-{ +- if (internalDragLoop.isRunning()) +- internalDragLoop.exit(); +-} +- +- + QPixmap QCocoaDrag::dragPixmap(QDrag *drag, QPoint &hotSpot) const + { + const QMimeData* data = drag->mimeData(); +diff --git a/src/plugins/platforms/cocoa/qnsview_dragging.mm b/src/plugins/platforms/cocoa/qnsview_dragging.mm +index 978d73f7d9..463e3c5579 100644 +--- a/src/plugins/platforms/cocoa/qnsview_dragging.mm ++++ b/src/plugins/platforms/cocoa/qnsview_dragging.mm +@@ -232,10 +232,6 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin + if (!target) + return; + +- auto *nativeDrag = QCocoaIntegration::instance()->drag(); +- Q_ASSERT(nativeDrag); +- nativeDrag->exitDragLoop(); +- + QPoint windowPoint = QPointF::fromCGPoint([self convertPoint:sender.draggingLocation fromView:nil]).toPoint(); + + qCDebug(lcQpaMouse) << QEvent::DragLeave << self << "at" << windowPoint; +@@ -294,10 +290,7 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin + if (!target) + return; + +- QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag(); +- Q_ASSERT(nativeDrag); +- nativeDrag->exitDragLoop(); +- nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation)); ++ QCocoaIntegration::instance()->drag(); + + // Qt starts drag-and-drop on a mouse button press event. Cococa in + // this case won't send the matching release event, so we have to +-- +2.21.0 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch new file mode 100644 index 0000000000000..f93f80055982d --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0005-Revert-macOS-Fix-use-of-deprecated-NSOffState.patch @@ -0,0 +1,26 @@ +From e55ca5d08b29e67b699dc217abcb65e4a7655f72 Mon Sep 17 00:00:00 2001 +From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> +Date: Mon, 7 Dec 2020 12:32:37 -0500 +Subject: [PATCH 5/6] Revert "macOS: Fix use of deprecated NSOffState" + +This reverts commit 6a0995525d306a1fa224adcbcb9f0ae1fc7d01bd. +--- + src/plugins/styles/mac/qmacstyle_mac.mm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm +index d1febd81d4..b5e6e60ec0 100644 +--- a/src/plugins/styles/mac/qmacstyle_mac.mm ++++ b/src/plugins/styles/mac/qmacstyle_mac.mm +@@ -3955,7 +3955,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter + pbCell = static_cast<NSPopUpButtonCell *>(pb.cell); + oldPosition = pbCell.arrowPosition; + pbCell.arrowPosition = NSPopUpNoArrow; +- if (pb.state == NSControlStateValueOff) { ++ if (pb.state == NSOffState) { + // NSPopUpButton in this state is smaller. + rAdjusted.origin.x -= 3; + rAdjusted.size.width += 6; +-- +2.21.0 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch new file mode 100644 index 0000000000000..b5c634aff76bc --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0006-git-checkout-v5.15.0-src-plugins-platforms-cocoa-qco.patch @@ -0,0 +1,77 @@ +From 3ce5e752c66307f905fdf732b102a396d9248fbb Mon Sep 17 00:00:00 2001 +From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com> +Date: Mon, 7 Dec 2020 13:22:02 -0500 +Subject: [PATCH 6/6] git checkout v5.15.0 -- + src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm + +--- + .../cocoa/qcocoacolordialoghelper.mm | 50 +++++++++---------- + 1 file changed, 25 insertions(+), 25 deletions(-) + +diff --git a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm +index 5ad1f9d7bb..c9fa035d87 100644 +--- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm ++++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm +@@ -180,34 +180,34 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate); + + - (void)updateQtColor + { +- // Discard the color space and pass the color components to QColor. This +- // is a good option as long as QColor is color-unmanaged: we preserve the +- // exact RGB value from the color picker, which is predictable. Further, +- // painting with the color will reproduce the same color on-screen, as +- // long as the the same screen is used for selecting the color. +- NSColor *componentColor = [[mColorPanel color] colorUsingType:NSColorTypeComponentBased]; +- switch (componentColor.colorSpace.colorSpaceModel) +- { +- case NSColorSpaceModelGray: { +- CGFloat white = 0, alpha = 0; +- [componentColor getWhite:&white alpha:&alpha]; +- mQtColor.setRgbF(white, white, white, alpha); +- } break; +- case NSColorSpaceModelRGB: { +- CGFloat red = 0, green = 0, blue = 0, alpha = 0; +- [componentColor getRed:&red green:&green blue:&blue alpha:&alpha]; +- mQtColor.setRgbF(red, green, blue, alpha); +- } break; +- case NSColorSpaceModelCMYK: { ++ NSColor *color = [mColorPanel color]; ++ NSString *colorSpaceName = [color colorSpaceName]; ++ if (colorSpaceName == NSDeviceCMYKColorSpace) { + CGFloat cyan = 0, magenta = 0, yellow = 0, black = 0, alpha = 0; +- [componentColor getCyan:&cyan magenta:&magenta yellow:&yellow black:&black alpha:&alpha]; ++ [color getCyan:&cyan magenta:&magenta yellow:&yellow black:&black alpha:&alpha]; + mQtColor.setCmykF(cyan, magenta, yellow, black, alpha); +- } break; +- default: +- qWarning("QNSColorPanelDelegate: Unsupported color space model"); +- break; ++ } else if (colorSpaceName == NSCalibratedRGBColorSpace || colorSpaceName == NSDeviceRGBColorSpace) { ++ CGFloat red = 0, green = 0, blue = 0, alpha = 0; ++ [color getRed:&red green:&green blue:&blue alpha:&alpha]; ++ mQtColor.setRgbF(red, green, blue, alpha); ++ } else if (colorSpaceName == NSNamedColorSpace) { ++ NSColor *tmpColor = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; ++ CGFloat red = 0, green = 0, blue = 0, alpha = 0; ++ [tmpColor getRed:&red green:&green blue:&blue alpha:&alpha]; ++ mQtColor.setRgbF(red, green, blue, alpha); ++ } else { ++ NSColorSpace *colorSpace = [color colorSpace]; ++ if ([colorSpace colorSpaceModel] == NSCMYKColorSpaceModel && [color numberOfComponents] == 5){ ++ CGFloat components[5]; ++ [color getComponents:components]; ++ mQtColor.setCmykF(components[0], components[1], components[2], components[3], components[4]); ++ } else { ++ NSColor *tmpColor = [color colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; ++ CGFloat red = 0, green = 0, blue = 0, alpha = 0; ++ [tmpColor getRed:&red green:&green blue:&blue alpha:&alpha]; ++ mQtColor.setRgbF(red, green, blue, alpha); ++ } + } +- + if (mHelper) + emit mHelper->currentColorChanged(mQtColor); + } +-- +2.21.0 + diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix index c88e896286eef..70e9c3a80225d 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -4,339 +4,339 @@ { qt3d = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qt3d-everywhere-src-5.15.0.tar.xz"; - sha256 = "61856f0c453b79e98b7a1e65ea8f59976fa78230ffa8dec959b5f4b45383dffd"; - name = "qt3d-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qt3d-everywhere-src-5.15.2.tar.xz"; + sha256 = "03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d"; + name = "qt3d-everywhere-src-5.15.2.tar.xz"; }; }; qtactiveqt = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtactiveqt-everywhere-src-5.15.0.tar.xz"; - sha256 = "1b455eacfb9ef49912d7a79040ea409a6ab88dfa192d313e6b5e02a79d741b51"; - name = "qtactiveqt-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtactiveqt-everywhere-src-5.15.2.tar.xz"; + sha256 = "868161fee0876d17079cd5bed58d1667bf19ffd0018cbe515129f11510ad2a5c"; + name = "qtactiveqt-everywhere-src-5.15.2.tar.xz"; }; }; qtandroidextras = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtandroidextras-everywhere-src-5.15.0.tar.xz"; - sha256 = "c9019185221e94e37e250c84acaebfb7b2f5342e8ad60cdcff052ac2b85ec671"; - name = "qtandroidextras-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtandroidextras-everywhere-src-5.15.2.tar.xz"; + sha256 = "5813278690d89a9c232eccf697fc280034de6f9f02a7c40d95ad5fcf8ac8dabd"; + name = "qtandroidextras-everywhere-src-5.15.2.tar.xz"; }; }; qtbase = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz"; - sha256 = "9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5"; - name = "qtbase-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtbase-everywhere-src-5.15.2.tar.xz"; + sha256 = "909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8"; + name = "qtbase-everywhere-src-5.15.2.tar.xz"; }; }; qtcharts = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtcharts-everywhere-src-5.15.0.tar.xz"; - sha256 = "44a24fc16abcaf9ae97ecf3215f6f3b44ebdb3b73bcb4ed3549a51519e4883a7"; - name = "qtcharts-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz"; + sha256 = "e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11"; + name = "qtcharts-everywhere-src-5.15.2.tar.xz"; }; }; qtconnectivity = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtconnectivity-everywhere-src-5.15.0.tar.xz"; - sha256 = "f911fb8f8bf3a9958785d0378d25ced8989047938b7138d619854a94fa0b27dd"; - name = "qtconnectivity-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtconnectivity-everywhere-src-5.15.2.tar.xz"; + sha256 = "0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0"; + name = "qtconnectivity-everywhere-src-5.15.2.tar.xz"; }; }; qtdatavis3d = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdatavis3d-everywhere-src-5.15.0.tar.xz"; - sha256 = "8f07747f371f7c515c667240a795105c89aa83c08d88ee92fa1ef7efccea10a3"; - name = "qtdatavis3d-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdatavis3d-everywhere-src-5.15.2.tar.xz"; + sha256 = "226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd"; + name = "qtdatavis3d-everywhere-src-5.15.2.tar.xz"; }; }; qtdeclarative = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdeclarative-everywhere-src-5.15.0.tar.xz"; - sha256 = "9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699"; - name = "qtdeclarative-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz"; + sha256 = "c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651"; + name = "qtdeclarative-everywhere-src-5.15.2.tar.xz"; }; }; qtdoc = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdoc-everywhere-src-5.15.0.tar.xz"; - sha256 = "07ca8db98c317f25cc9a041c48a6824baf63893bf5b535d6f8d266dea8c7659f"; - name = "qtdoc-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtdoc-everywhere-src-5.15.2.tar.xz"; + sha256 = "a47809f00f1bd690ca4e699cb32ffe7717d43da84e0167d1f562210da7714ce4"; + name = "qtdoc-everywhere-src-5.15.2.tar.xz"; }; }; qtgamepad = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtgamepad-everywhere-src-5.15.0.tar.xz"; - sha256 = "dda54d9f90897944bed5e6af48a904a677fd97eb6f57ab08a2b232c431caf31a"; - name = "qtgamepad-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtgamepad-everywhere-src-5.15.2.tar.xz"; + sha256 = "c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c"; + name = "qtgamepad-everywhere-src-5.15.2.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz"; - sha256 = "0d2ea4bc73b9df13a4b739dcbc1e3c7b298c7e682f7f9252b232e3bde7b63eda"; - name = "qtgraphicaleffects-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz"; + sha256 = "ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4"; + name = "qtgraphicaleffects-everywhere-src-5.15.2.tar.xz"; }; }; qtimageformats = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtimageformats-everywhere-src-5.15.0.tar.xz"; - sha256 = "83f32101b1a898fcb8ed6f11a657d1125484ac0c2223014b61849d9010efebc8"; - name = "qtimageformats-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtimageformats-everywhere-src-5.15.2.tar.xz"; + sha256 = "bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7"; + name = "qtimageformats-everywhere-src-5.15.2.tar.xz"; }; }; qtlocation = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtlocation-everywhere-src-5.15.0.tar.xz"; - sha256 = "c68b0778a521e5522641c41b1778999dd408ebfda1e0de166a83743268be5f3f"; - name = "qtlocation-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz"; + sha256 = "984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0"; + name = "qtlocation-everywhere-src-5.15.2.tar.xz"; }; }; qtlottie = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtlottie-everywhere-src-5.15.0.tar.xz"; - sha256 = "2053f474dcd7184fdcae2507f47af6527f6ca25b4424483f9265853c3626c833"; - name = "qtlottie-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtlottie-everywhere-src-5.15.2.tar.xz"; + sha256 = "cec6095ab8f714e609d2ad3ea8c4fd819461ce8793adc42abe37d0f6dc432517"; + name = "qtlottie-everywhere-src-5.15.2.tar.xz"; }; }; qtmacextras = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtmacextras-everywhere-src-5.15.0.tar.xz"; - sha256 = "95a8c35b30373224cdd6d1ca0bdda1a314b20e91551a4824e8ca7e50ce8ff439"; - name = "qtmacextras-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtmacextras-everywhere-src-5.15.2.tar.xz"; + sha256 = "6959b0f2cec71cd66800f36cab797430860e55fa33c9c23698d6a08fc2b8776e"; + name = "qtmacextras-everywhere-src-5.15.2.tar.xz"; }; }; qtmultimedia = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtmultimedia-everywhere-src-5.15.0.tar.xz"; - sha256 = "0708d867697f392dd3600c5c1c88f5c61b772a5250a4d059dca67b844af0fbd7"; - name = "qtmultimedia-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz"; + sha256 = "0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5"; + name = "qtmultimedia-everywhere-src-5.15.2.tar.xz"; }; }; qtnetworkauth = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtnetworkauth-everywhere-src-5.15.0.tar.xz"; - sha256 = "96c6107f6e85662a05f114c5b9bd3503a3100bd940e1494c73a99e77f9e7cf85"; - name = "qtnetworkauth-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtnetworkauth-everywhere-src-5.15.2.tar.xz"; + sha256 = "fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85"; + name = "qtnetworkauth-everywhere-src-5.15.2.tar.xz"; }; }; qtpurchasing = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtpurchasing-everywhere-src-5.15.0.tar.xz"; - sha256 = "2127f180c4889055d88e2b402b62be80a5a213a0e48d2056cc9a01d9913b3a16"; - name = "qtpurchasing-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtpurchasing-everywhere-src-5.15.2.tar.xz"; + sha256 = "87120d319ff2f8106e78971f7296d72a66dfe91e763d213199aea55046e93227"; + name = "qtpurchasing-everywhere-src-5.15.2.tar.xz"; }; }; qtquick3d = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquick3d-everywhere-src-5.15.0.tar.xz"; - sha256 = "6d3b91b653ba5e33fd5b37cd785ded6cf1dd83d35250c3addb77eb35f90e52cb"; - name = "qtquick3d-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquick3d-everywhere-src-5.15.2.tar.xz"; + sha256 = "5b0546323365ce34e4716f22f305ebb4902e222c1a0910b65ee448443c2f94bb"; + name = "qtquick3d-everywhere-src-5.15.2.tar.xz"; }; }; qtquickcontrols = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquickcontrols-everywhere-src-5.15.0.tar.xz"; - sha256 = "7072cf4cd27e9f18b36b1c48dec7c79608cf87ba847d3fc3de133f220ec1acee"; - name = "qtquickcontrols-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz"; + sha256 = "c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5"; + name = "qtquickcontrols-everywhere-src-5.15.2.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquickcontrols2-everywhere-src-5.15.0.tar.xz"; - sha256 = "839abda9b58cd8656b2e5f46afbb484e63df466481ace43318c4c2022684648f"; - name = "qtquickcontrols2-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols2-everywhere-src-5.15.2.tar.xz"; + sha256 = "671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919"; + name = "qtquickcontrols2-everywhere-src-5.15.2.tar.xz"; }; }; qtquicktimeline = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquicktimeline-everywhere-src-5.15.0.tar.xz"; - sha256 = "16ffeb733ba15815121fca5705ed5220ce0a0eb2ec0431ad0d55da9426a03c00"; - name = "qtquicktimeline-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz"; + sha256 = "b9c247227607437acec7c7dd18ad46179d20369c9d22bdb1e9fc128dfb832a28"; + name = "qtquicktimeline-everywhere-src-5.15.2.tar.xz"; }; }; qtremoteobjects = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtremoteobjects-everywhere-src-5.15.0.tar.xz"; - sha256 = "86fcfdce77f13c7babdec4dc1d0c4b7b6b02e40120a4250dc59e911c53c08abf"; - name = "qtremoteobjects-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtremoteobjects-everywhere-src-5.15.2.tar.xz"; + sha256 = "6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2"; + name = "qtremoteobjects-everywhere-src-5.15.2.tar.xz"; }; }; qtscript = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtscript-everywhere-src-5.15.0.tar.xz"; - sha256 = "02dc21b309621876a89671be27cea86a58e74a96aa28da65fe1b37a3aad29373"; - name = "qtscript-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz"; + sha256 = "a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e"; + name = "qtscript-everywhere-src-5.15.2.tar.xz"; }; }; qtscxml = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtscxml-everywhere-src-5.15.0.tar.xz"; - sha256 = "9c3a72bf5ebd07553b0049cc1943f04cff93b7e53bde8c81d652422dbf12ff72"; - name = "qtscxml-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz"; + sha256 = "60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc"; + name = "qtscxml-everywhere-src-5.15.2.tar.xz"; }; }; qtsensors = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtsensors-everywhere-src-5.15.0.tar.xz"; - sha256 = "12b17ed6cbe6c49c8ab71958bc5d8ad1c42bf20e2fa72613ede11001e98144da"; - name = "qtsensors-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz"; + sha256 = "3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839"; + name = "qtsensors-everywhere-src-5.15.2.tar.xz"; }; }; qtserialbus = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtserialbus-everywhere-src-5.15.0.tar.xz"; - sha256 = "cee067c84d025e221b83d109b58ea16c4d2dc0af0aea45cc6724acd33a1b7379"; - name = "qtserialbus-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz"; + sha256 = "aeeb7e5c0d3f8503215b22e1a84c0002ca67cf63862f6e3c6ef44a67ca31bd88"; + name = "qtserialbus-everywhere-src-5.15.2.tar.xz"; }; }; qtserialport = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtserialport-everywhere-src-5.15.0.tar.xz"; - sha256 = "ba19369069a707dffddca8d9c477bb2bb4aa26630dfee6792254c4bf9bd57a67"; - name = "qtserialport-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz"; + sha256 = "59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d"; + name = "qtserialport-everywhere-src-5.15.2.tar.xz"; }; }; qtspeech = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtspeech-everywhere-src-5.15.0.tar.xz"; - sha256 = "7219a878c14a24d0ca18d52df1717361b13aee96ac9790baf9ad2b383492dd61"; - name = "qtspeech-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtspeech-everywhere-src-5.15.2.tar.xz"; + sha256 = "c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5"; + name = "qtspeech-everywhere-src-5.15.2.tar.xz"; }; }; qtsvg = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtsvg-everywhere-src-5.15.0.tar.xz"; - sha256 = "ee4d287e2e205ca8c08921b9cbe0fc58bf46be080b5359ad4d7fbdee44aeee0d"; - name = "qtsvg-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtsvg-everywhere-src-5.15.2.tar.xz"; + sha256 = "8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e"; + name = "qtsvg-everywhere-src-5.15.2.tar.xz"; }; }; qttools = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz"; - sha256 = "ddbcb49aab3a2e3672582c6e2e7bec0058feff790f67472343c79e2895e0e437"; - name = "qttools-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz"; + sha256 = "c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc"; + name = "qttools-everywhere-src-5.15.2.tar.xz"; }; }; qttranslations = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qttranslations-everywhere-src-5.15.0.tar.xz"; - sha256 = "45c43268d9df50784d4d8ca345fce9288a1055fd074ac0ef508097f7aeba22fe"; - name = "qttranslations-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qttranslations-everywhere-src-5.15.2.tar.xz"; + sha256 = "d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8"; + name = "qttranslations-everywhere-src-5.15.2.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz"; - sha256 = "f22f9204ab65578d9c8aa832a8a39108f826e00a7d391c7884ff490c587f34be"; - name = "qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz"; + sha256 = "9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55"; + name = "qtvirtualkeyboard-everywhere-src-5.15.2.tar.xz"; }; }; qtwayland = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwayland-everywhere-src-5.15.0.tar.xz"; - sha256 = "084133e10bfbd32a28125639660c59975f23457bba6a79b30a25802cec76a9fb"; - name = "qtwayland-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwayland-everywhere-src-5.15.2.tar.xz"; + sha256 = "193732229ff816f3aaab9a5e2f6bed71ddddbf1988ce003fe8dd84a92ce9aeb5"; + name = "qtwayland-everywhere-src-5.15.2.tar.xz"; }; }; qtwebchannel = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebchannel-everywhere-src-5.15.0.tar.xz"; - sha256 = "ea80510b363e6f92ce99932f06d176e43459c4a5159fe97b5ef96fcfbab5ed4f"; - name = "qtwebchannel-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebchannel-everywhere-src-5.15.2.tar.xz"; + sha256 = "127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1"; + name = "qtwebchannel-everywhere-src-5.15.2.tar.xz"; }; }; qtwebengine = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebengine-everywhere-src-5.15.0.tar.xz"; - sha256 = "c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df"; - name = "qtwebengine-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebengine-everywhere-src-5.15.2.tar.xz"; + sha256 = "c8afca0e43d84f7bd595436fbe4d13a5bbdb81ec5104d605085d07545b6f91e0"; + name = "qtwebengine-everywhere-src-5.15.2.tar.xz"; }; }; qtwebglplugin = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebglplugin-everywhere-src-5.15.0.tar.xz"; - sha256 = "f7b81f25ddf7b3a0046daa7224bc1e18c8b754b00b1a33775f30f827a5cdca15"; - name = "qtwebglplugin-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebglplugin-everywhere-src-5.15.2.tar.xz"; + sha256 = "81e782b517ed29e10bea1aa90c9f59274c98a910f2c8b105fa78368a36b41446"; + name = "qtwebglplugin-everywhere-src-5.15.2.tar.xz"; }; }; qtwebsockets = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebsockets-everywhere-src-5.15.0.tar.xz"; - sha256 = "87c2f6542778f9b65b3f208740c1d0db643fd0bede21404b9abb265355da5092"; - name = "qtwebsockets-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebsockets-everywhere-src-5.15.2.tar.xz"; + sha256 = "a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f"; + name = "qtwebsockets-everywhere-src-5.15.2.tar.xz"; }; }; qtwebview = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebview-everywhere-src-5.15.0.tar.xz"; - sha256 = "b87ea205ce79c6b438ebe596e91fa80ba11f6aac7e89ffbf52b337d0fc8d6660"; - name = "qtwebview-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz"; + sha256 = "be9f46167e4977ead5ef5ecf883fdb812a4120f2436383583792f65557e481e7"; + name = "qtwebview-everywhere-src-5.15.2.tar.xz"; }; }; qtwinextras = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwinextras-everywhere-src-5.15.0.tar.xz"; - sha256 = "d77f2cb2ce83bdbfd0a970bc8d7d11c96b2df16befc257d6594f79dfd92abff0"; - name = "qtwinextras-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtwinextras-everywhere-src-5.15.2.tar.xz"; + sha256 = "65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e"; + name = "qtwinextras-everywhere-src-5.15.2.tar.xz"; }; }; qtx11extras = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtx11extras-everywhere-src-5.15.0.tar.xz"; - sha256 = "c72b6c188284facddcf82835af048240e721dc8d6d9e8a7bd71d76fd876881a1"; - name = "qtx11extras-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz"; + sha256 = "7014702ee9a644a5a93da70848ac47c18851d4f8ed622b29a72eed9282fc6e3e"; + name = "qtx11extras-everywhere-src-5.15.2.tar.xz"; }; }; qtxmlpatterns = { - version = "5.15.0"; + version = "5.15.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtxmlpatterns-everywhere-src-5.15.0.tar.xz"; - sha256 = "2752cf2aa25ebfda89c3736457e27b3d0c7c7ed290dcfd52c209f9f905998507"; - name = "qtxmlpatterns-everywhere-src-5.15.0.tar.xz"; + url = "${mirror}/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz"; + sha256 = "76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa"; + name = "qtxmlpatterns-everywhere-src-5.15.2.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 2120c6938571f..a5c96dc351b9e 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "0.15.3"; + version = "0.16.0"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "0jq3y63c36nr2rprg7im9ik112p5zvhj46vzgxfbnpvskmg0cchm"; + sha256 = "05ihjslnv7rrp4giwvvyaiig0dpfmw3jijfaadzax8jhbyscmxsq"; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 55b2f0ff1868a..5e6ce5d679785 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 = "3.10.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - hash = "sha256-P36JKFgXSZagWzHB6WB2WlDu7jkVvfYVo1BaV0b8iEk="; + hash = "sha256-B27ff1b9JRhxFUsBt7CGuYaR87hvKbVSCERWD45d8tM="; }; nativeBuildInputs = [ cmake rocm-cmake ]; diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index e6546e0d33614..f8254991013c4 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "3.10.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 54c7cb9a10b50..7c50e37522808 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "3.10.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 4681267da18ac..ecd9e0f7e8257 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "3.10.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 4df954f4b258c..15435e7914d36 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "3.10.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index bf0a05fe73e8b..535f686f23d0b 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 = "3.10.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - hash = "sha256-FLH+GHXA0zepbR1wPPSez/hx1hiG2kkCTneDKhJJRjU="; + hash = "sha256-2kLSlGwX3pD8I5pXwV5L0k9l8OzJRkUvnAqv5E+gcd4="; }; preConfigure = '' diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index 3a7c0b3c410be..e6fb1d7caf75c 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.1.3"; + version = "2020.3.4"; 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 = "1l8kiicm0klbx0b05994vqd8a8wj7k0djbbg41a6i3q5d17jrnk6"; + sha256 = "1laa8dllpvf2z0cjxx22ravdf1d7a18bm708gd2ny35fhjfibm0h"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix index 41b88b7f310ea..fc45e220a51c1 100644 --- a/pkgs/development/libraries/sonic/default.nix +++ b/pkgs/development/libraries/sonic/default.nix @@ -1,27 +1,33 @@ -{ stdenv, fetchFromGitHub, fftw }: +{ stdenv, fetchFromGitHub, fftw, installShellFiles }: stdenv.mkDerivation { - pname = "sonic"; - version = "2018-07-06"; + pname = "sonic-unstable"; + version = "2020-12-27"; src = fetchFromGitHub { owner = "waywardgeek"; repo = "sonic"; - rev = "71c51195de71627d7443d05378c680ba756545e8"; - sha256 = "1z9qdk3pk507hdg39v2z1hanlw2wv7mhn8br4cb8qry9z9qwi87i"; + rev = "4a052d9774387a9d9b4af627f6a74e1694419960"; + sha256 = "0ah54nizb6iwcx277w104wsfnx05vrp4sh56d2pfxhf8xghg54m6"; }; - postPatch = '' - sed -i "s,^PREFIX=.*,PREFIX=$out," Makefile - ''; + makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ]; + + nativeBuildInputs = [ installShellFiles ]; buildInputs = [ fftw ]; + postInstall = '' + installManPage sonic.1 + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libsonic.so.0.3.0 $out/lib/libsonic.so.0.3.0 + ''; + meta = with stdenv.lib; { description = "Simple library to speed up or slow down speech"; homepage = "https://github.com/waywardgeek/sonic"; license = licenses.asl20; maintainers = with maintainers; [ aske ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/stellarsolver/default.nix b/pkgs/development/libraries/stellarsolver/default.nix new file mode 100644 index 0000000000000..69417299615b3 --- /dev/null +++ b/pkgs/development/libraries/stellarsolver/default.nix @@ -0,0 +1,30 @@ +{ stdenv, mkDerivation, fetchFromGitHub, cmake, + qtbase, cfitsio, gsl, wcslib, withTester ? false }: + +mkDerivation rec { + pname = "stellarsolver"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "rlancaste"; + repo = pname; + rev = version; + sha256 = "12j20j9qbkkx55ix4nm1iw7wd36hamkpidbwhcnmj4yk5fqlyq4y"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qtbase cfitsio gsl wcslib ]; + + cmakeFlags = [ + "-DBUILD_TESTER=${if withTester then "on" else "off"}" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/rlancaste/stellarsolver"; + description = "Astrometric plate solving library"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hjones2199 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/libraries/sundials/2.x.nix b/pkgs/development/libraries/sundials/2.x.nix deleted file mode 100644 index ae22f0be17979..0000000000000 --- a/pkgs/development/libraries/sundials/2.x.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv -, cmake -, fetchurl -, python -# GNU Octave needs KLU for ODE solvers -, suitesparse -, blas, lapack -, gfortran -, lapackSupport ? true }: - -assert (!blas.isILP64) && (!lapack.isILP64); - -stdenv.mkDerivation rec { - pname = "sundials"; - version = "2.7.0"; - - buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ - gfortran - suitesparse - ]; - nativeBuildInputs = [ cmake ]; - - src = fetchurl { - url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "01513g0j7nr3rh7hqjld6mw0mcx5j9z9y87bwjc16w2x2z3wm7yk"; - }; - - patches = [ - (fetchurl { - # https://github.com/LLNL/sundials/pull/19 - url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch"; - sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l"; - }) - ]; - - cmakeFlags = [ - "-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples" - ] ++ stdenv.lib.optionals (lapackSupport) [ - "-DSUNDIALS_INDEX_TYPE=int32_t" - # GNU Octave needs KLU for ODE solvers - "-DKLU_ENABLE=ON" - "-DKLU_INCLUDE_DIR=${suitesparse}/include" - "-DKLU_LIBRARY_DIR=${suitesparse}/lib" - "-DLAPACK_ENABLE=ON" - "-DLAPACK_LIBRARIES=${lapack}/lib/lapack${stdenv.hostPlatform.extensions.sharedLibrary};${blas}/lib/blas${stdenv.hostPlatform.extensions.sharedLibrary}" - ]; - - # flaky tests, and patch in https://github.com/LLNL/sundials/pull/21 doesn't apply cleanly for sundials_3 - doCheck = false; - checkPhase = "make test"; - - meta = with stdenv.lib; { - description = "Suite of nonlinear differential/algebraic equation solvers"; - homepage = "https://computation.llnl.gov/projects/sundials"; - platforms = platforms.all; - maintainers = with maintainers; [ idontgetoutmuch ]; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 1c0b70f6896a2..cd8c90f319d79 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -1,52 +1,69 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig -, gobject-introspection, glib, systemd, libgudev, vala -, usbutils, which, python3 }: +{ stdenv +, docbook_xsl +, fetchurl +, glib +, gobject-introspection +, gtk-doc +, libgudev +, meson +, ninja +, pkg-config +, python3 +, systemd +, usbutils +, vala +, which +}: stdenv.mkDerivation rec { pname = "umockdev"; - version = "0.13.1"; + version = "0.15.2"; outputs = [ "bin" "out" "dev" "doc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "197a169imiirgm73d9fn9234cx56agyw9d2f47h7f1d8s2d51lla"; + sha256 = "19f21qb9ckwvlm7yzpnc0vcp092qbkms2yrafc26b9a63v4imj52"; }; - patches = [ - ./fix-test-paths.patch - # https://github.com/NixOS/nixpkgs/commit/9960a2be9b32a6d868046c5bfa188b9a0dd66682#commitcomment-34734461 - ./disable-failed-test.patch - # https://github.com/martinpitt/umockdev/pull/93 - (fetchpatch { - url = "https://github.com/abbradar/umockdev/commit/ce22f893bf50de0b32760238a3e2cfb194db89e9.patch"; - sha256 = "01q3qhs30x8hl23iigimsa2ikbiw8y8y0bpmh02mh1my87shpwnx"; - }) + mesonFlags = [ + "-Dgtk_doc=true" ]; - # autoreconfHook complains if we try to build the documentation - postPatch = '' - echo 'EXTRA_DIST =' > docs/gtk-doc.make - ''; - preCheck = '' patchShebangs tests/test-static-code ''; buildInputs = [ glib systemd libgudev ]; - nativeBuildInputs = [ pkgconfig vala gobject-introspection ]; + nativeBuildInputs = [ + docbook_xsl + gobject-introspection + gtk-doc + meson + ninja + pkg-config + vala + ]; checkInputs = [ python3 which usbutils ]; enableParallelBuilding = true; - doCheck = true; + # Test fail with libusb 1.0.24 + # https://github.com/NixOS/nixpkgs/issues/107420 + # https://github.com/martinpitt/umockdev/issues/115 + doCheck = false; + + postInstall = '' + mkdir -p $doc/share/doc/umockdev/ + mv docs/reference $doc/share/doc/umockdev/ + ''; meta = with stdenv.lib; { description = "Mock hardware devices for creating unit tests"; license = licenses.lgpl2; - maintainers = with maintainers; []; + maintainers = with maintainers; [ flokli ]; platforms = with platforms; linux; }; } diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 3f8f47793a4bf..ea455e2c92c17 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "utf8proc"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = pname; rev = "v${version}"; - sha256 = "0czk8xw1jra0fjf6w4bcaridyz3wz2br3v7ik1g7z0j5grx9n8r1"; + sha256 = "1zqc6airkzkssbjxanx5v8blfk90180gc9id0dx8ncs54f1ib8w7"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/vtk/7.x.nix b/pkgs/development/libraries/vtk/7.x.nix index f3ec383fddfb8..55f950e0ac90e 100644 --- a/pkgs/development/libraries/vtk/7.x.nix +++ b/pkgs/development/libraries/vtk/7.x.nix @@ -1,74 +1,9 @@ -{ stdenv, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff -, fetchpatch -, qtLib ? null -, enablePython ? false, python ? null -# Darwin support -, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL -, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }: - -with stdenv.lib; - -let - os = stdenv.lib.optionalString; +import ./generic.nix { majorVersion = "7.1"; minorVersion = "1"; - version = "${majorVersion}.${minorVersion}"; -in - -stdenv.mkDerivation rec { - name = "vtk-${os (qtLib != null) "qvtk-"}${version}"; - src = fetchurl { - url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz"; - sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d"; - }; - - patches = [ - (fetchpatch { - url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff"; - sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx"; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ libtiff ] - ++ optional (qtLib != null) qtLib - ++ optionals stdenv.isLinux [ libGLU libGL libX11 xorgproto libXt ] - ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit - CFNetwork Security ApplicationServices CoreText - IOSurface ImageIO OpenGL GLUT ] - ++ optional enablePython [ - python - ]; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc ]; - - preBuild = '' - export LD_LIBRARY_PATH="$(pwd)/lib"; - ''; - - # Shared libraries don't work, because of rpath troubles with the current - # nixpkgs cmake approach. It wants to call a binary at build time, just - # built and requiring one of the shared objects. - # At least, we use -fPIC for other packages to be able to use this in shared - # objects. - cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" ] - ++ optional (qtLib != null) [ "-DVTK_Group_Qt:BOOL=ON" ] - ++ optional stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] - ++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ]; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt - sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c - sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c - ''; - - enableParallelBuilding = true; - - meta = { - description = "Open source libraries for 3D computer graphics, image processing and visualization"; - homepage = "https://www.vtk.org/"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; - platforms = with stdenv.lib.platforms; unix; - }; + sourceSha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d"; + patchesToFetch = [{ + url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff"; + sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx"; + }]; } diff --git a/pkgs/development/libraries/vtk/8.x.nix b/pkgs/development/libraries/vtk/8.x.nix new file mode 100644 index 0000000000000..1563991f47f31 --- /dev/null +++ b/pkgs/development/libraries/vtk/8.x.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + majorVersion = "8.2"; + minorVersion = "0"; + sourceSha256 = "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl"; + patchesToFetch = [{ + url = "https://gitlab.kitware.com/vtk/vtk/-/commit/257b9d7b18d5f3db3fe099dc18f230e23f7dfbab.diff"; + sha256 = "0qdahp4f4gcaznr28j06d5fyxiis774ys0p335aazf7h51zb8rzy"; + }]; +} diff --git a/pkgs/development/libraries/vtk/9.x.nix b/pkgs/development/libraries/vtk/9.x.nix index 455431ec3415d..e99ba34999e79 100644 --- a/pkgs/development/libraries/vtk/9.x.nix +++ b/pkgs/development/libraries/vtk/9.x.nix @@ -1,95 +1,5 @@ -{ stdenv, mkDerivation, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff -, fetchpatch -, enableQt ? false, qtbase, qtx11extras, qttools -, enablePython ? false, python ? null -# Darwin support -, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL -, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }: - -with stdenv.lib; - -let - os = stdenv.lib.optionalString; +import ./generic.nix { majorVersion = "9.0"; minorVersion = "1"; - version = "${majorVersion}.${minorVersion}"; -in - -mkDerivation rec { - name = "vtk-${os enableQt "qvtk-"}${version}"; - src = fetchurl { - url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz"; - sha256 = "1ir2lq9i45ls374lcmjzw0nrm5l5hnm1w47lg8g8d0n2j7hsaf8v"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ libtiff ] - ++ optionals enableQt [ qtbase qtx11extras qttools ] - ++ optionals stdenv.isLinux [ - libGLU - libGL - libX11 - xorgproto - libXt - ] ++ optionals stdenv.isDarwin [ - xpc - Cocoa - CoreServices - DiskArbitration - IOKit - CFNetwork - Security - ApplicationServices - CoreText - IOSurface - ImageIO - OpenGL - GLUT - ] - ++ optional enablePython [ - python - ]; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc ]; - - preBuild = '' - export LD_LIBRARY_PATH="$(pwd)/lib"; - ''; - - # Shared libraries don't work, because of rpath troubles with the current - # nixpkgs cmake approach. It wants to call a binary at build time, just - # built and requiring one of the shared objects. - # At least, we use -fPIC for other packages to be able to use this in shared - # objects. - cmakeFlags = [ - "-DCMAKE_C_FLAGS=-fPIC" - "-DCMAKE_CXX_FLAGS=-fPIC" - "-DVTK_USE_SYSTEM_TIFF=1" - "-DOPENGL_INCLUDE_DIR=${libGL}/include" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_BINDIR=bin" - ] - ++ optionals enableQt [ "-DVTK_Group_Qt:BOOL=ON" ] - ++ optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] - ++ optionals enablePython [ - "-DVTK_WRAP_PYTHON:BOOL=ON" - "-DVTK_PYTHON_VERSION:STRING=3" - ]; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt - sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c - sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Open source libraries for 3D computer graphics, image processing and visualization"; - homepage = "https://www.vtk.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ tfmoraes ]; - platforms = with platforms; unix; - }; + sourceSha256 = "1ir2lq9i45ls374lcmjzw0nrm5l5hnm1w47lg8g8d0n2j7hsaf8v"; } diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix deleted file mode 100644 index 4ef140a09996b..0000000000000 --- a/pkgs/development/libraries/vtk/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff -, fetchpatch -, qtLib ? null -, enablePython ? false, python ? null -# Darwin support -, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL -, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }: - -with stdenv.lib; - -let - os = stdenv.lib.optionalString; - majorVersion = "8.2"; - minorVersion = "0"; - version = "${majorVersion}.${minorVersion}"; -in - -stdenv.mkDerivation rec { - name = "vtk-${os (qtLib != null) "qvtk-"}${version}"; - src = fetchurl { - url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz"; - sha256 = "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ libtiff ] - ++ optionals (qtLib != null) (with qtLib; [ qtbase qtx11extras qttools ]) - ++ optionals stdenv.isLinux [ libGLU libGL libX11 xorgproto libXt ] - ++ optionals stdenv.isDarwin [ xpc Cocoa CoreServices DiskArbitration IOKit - CFNetwork Security ApplicationServices CoreText - IOSurface ImageIO OpenGL GLUT ] - ++ optional enablePython [ - python - ]; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc ]; - - preBuild = '' - export LD_LIBRARY_PATH="$(pwd)/lib"; - ''; - - # Shared libraries don't work, because of rpath troubles with the current - # nixpkgs cmake approach. It wants to call a binary at build time, just - # built and requiring one of the shared objects. - # At least, we use -fPIC for other packages to be able to use this in shared - # objects. - cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" ] - ++ optional (qtLib != null) [ "-DVTK_Group_Qt:BOOL=ON" ] - ++ optional stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] - ++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ]; - - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt - sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c - sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c - ''; - - enableParallelBuilding = true; - - meta = { - description = "Open source libraries for 3D computer graphics, image processing and visualization"; - homepage = "https://www.vtk.org/"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; - platforms = with stdenv.lib.platforms; unix; - }; -} diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix new file mode 100644 index 0000000000000..7bfd8d9fcfff3 --- /dev/null +++ b/pkgs/development/libraries/vtk/generic.nix @@ -0,0 +1,96 @@ +{ majorVersion, minorVersion, sourceSha256, patchesToFetch ? [] }: +{ stdenv, lib, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff +, fetchpatch +, enableQt ? false, wrapQtAppsHook, qtbase, qtx11extras, qttools +, enablePython ? false, pythonInterpreter ? throw "vtk: Python support requested, but no python interpreter was given." +# Darwin support +, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL +, ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc +}: + +let + inherit (lib) optionalString optionals optional; + + pythonMajor = lib.substring 0 1 pythonInterpreter.pythonVersion; + +in stdenv.mkDerivation rec { + pname = "vtk${optionalString enableQt "-qvtk"}"; + version = "${majorVersion}.${minorVersion}"; + + src = fetchurl { + url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz"; + sha256 = sourceSha256; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libtiff ] + ++ optionals enableQt [ qtbase qtx11extras qttools ] + ++ optionals stdenv.isLinux [ + libGLU + libGL + libX11 + xorgproto + libXt + ] ++ optionals stdenv.isDarwin [ + xpc + Cocoa + CoreServices + DiskArbitration + IOKit + CFNetwork + Security + ApplicationServices + CoreText + IOSurface + ImageIO + OpenGL + GLUT + ] ++ optional enablePython [ + pythonInterpreter + ]; + propagatedBuildInputs = optionals stdenv.isDarwin [ libobjc ]; + + patches = map fetchpatch patchesToFetch; + + preBuild = '' + export LD_LIBRARY_PATH="$(pwd)/lib"; + ''; + + # Shared libraries don't work, because of rpath troubles with the current + # nixpkgs cmake approach. It wants to call a binary at build time, just + # built and requiring one of the shared objects. + # At least, we use -fPIC for other packages to be able to use this in shared + # objects. + cmakeFlags = [ + "-DCMAKE_C_FLAGS=-fPIC" + "-DCMAKE_CXX_FLAGS=-fPIC" + "-DVTK_USE_SYSTEM_TIFF=1" + "-DOPENGL_INCLUDE_DIR=${libGL}/include" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_BINDIR=bin" + ] + ++ optionals enableQt [ "-DVTK_Group_Qt:BOOL=ON" ] + ++ optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] + ++ optionals enablePython [ + "-DVTK_WRAP_PYTHON:BOOL=ON" + "-DVTK_PYTHON_VERSION:STRING=${pythonMajor}" + ]; + + postPatch = optionalString stdenv.isDarwin '' + sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt + sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c + sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Open source libraries for 3D computer graphics, image processing and visualization"; + homepage = "https://www.vtk.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ knedlsepp tfmoraes lheckemann ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix index 66a1b7ab1450a..0f1e36b35795c 100644 --- a/pkgs/development/libraries/waffle/default.nix +++ b/pkgs/development/libraries/waffle/default.nix @@ -1,16 +1,23 @@ { stdenv , fetchFromGitLab , lib -, cmake +, meson +, ninja , libGL -, libglvnd +, libglvnd ? null , makeWrapper , pkg-config -, wayland -, libxcb -, libX11 +, python3 +, x11Support ? true, libxcb ? null, libX11 ? null +, waylandSupport ? true, wayland ? null +, useGbm ? true, mesa ? null, libudev ? null }: +assert x11Support -> (libxcb != null && libX11 != null); +assert waylandSupport -> wayland != null; +assert useGbm -> (mesa != null && libudev != null); +assert with stdenv.hostPlatform; isUnix && !isDarwin -> libglvnd != null; + stdenv.mkDerivation rec { pname = "waffle"; version = "1.6.1"; @@ -25,20 +32,26 @@ stdenv.mkDerivation rec { buildInputs = [ libGL + ] ++ stdenv.lib.optionals (with stdenv.hostPlatform; isUnix && !isDarwin) [ libglvnd + ] ++ stdenv.lib.optionals x11Support [ libX11 libxcb + ] ++ stdenv.lib.optionals waylandSupport [ wayland + ] ++ stdenv.lib.optionals useGbm [ + mesa + libudev ]; nativeBuildInputs = [ - cmake + meson + ninja makeWrapper pkg-config + python3 ]; - cmakeFlags = [ "-Dplatforms=x11,wayland" ]; - postInstall = '' wrapProgram $out/bin/wflinfo \ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]} diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index 6a7b091b5367d..d04cadb483b02 100644 --- a/pkgs/development/libraries/websocket++/default.nix +++ b/pkgs/development/libraries/websocket++/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "12ffczcrryh74c1xssww35ic6yiy2l2xgdd30lshiq9wnzl2brgy"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { homepage = "https://www.zaphoyd.com/websocketpp/"; diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 7bfc96fbf47c7..db5e91b74d661 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.6.1"; + version = "4.6.2"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - sha256 = "0q5glzr49rjnpp6iqrx7zr9bz4n2ca0q0i0phk7y27rmxzrgpxk1"; + sha256 = "10jlb4p3ahck9apcy2c2mrrjynv4c1dfwwbf1vwd8dl17pgv4kgs"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/xed/default.nix b/pkgs/development/libraries/xed/default.nix new file mode 100644 index 0000000000000..1d6dcdc67adef --- /dev/null +++ b/pkgs/development/libraries/xed/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, python3Packages }: + +let + # mbuild is a custom build system used only to build xed + mbuild = python3Packages.buildPythonPackage rec { + pname = "mbuild"; + version = "0.2496-dev"; + + src = fetchFromGitHub { + owner = "intelxed"; + repo = "mbuild"; + rev = "3e8eb33aada4153c21c4261b35e5f51f6e2019e8"; + sha256 = "0yamgzkzw4v6x1a857psw9f7i62ydgd0zaqrf33dbdg8hfd2mq3q"; + }; + }; + +in stdenv.mkDerivation rec { + pname = "xed"; + version = "12.0.1"; + + src = fetchFromGitHub { + owner = "intelxed"; + repo = "xed"; + rev = version; + sha256 = "07zfff8zf29c2n0wal87hiqfq3cwcjn80zz78mz0nyjfj09nd39f"; + }; + + nativeBuildInputs = [ mbuild ]; + + buildPhase = '' + patchShebangs mfile.py + + # this will build, test and install + ./mfile.py test --prefix $out + ''; + + dontInstall = true; # already installed during buildPhase + + meta = with stdenv.lib; { + description = "Intel X86 Encoder Decoder (Intel XED)"; + homepage = "https://intelxed.github.io/"; + license = licenses.apsl20; + platforms = platforms.unix; + maintainers = with maintainers; [ arturcygan ]; + }; +} diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/pkgs/development/misc/rpiboot/unstable.nix index a8f7e4795e77a..f12f5a845f171 100644 --- a/pkgs/development/misc/rpiboot/unstable.nix +++ b/pkgs/development/misc/rpiboot/unstable.nix @@ -1,16 +1,14 @@ { stdenv, fetchFromGitHub, libusb1 }: -let - version = "2020-05-11"; - name = "rpiboot-unstable-${version}"; -in stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation { + pname = "rpiboot"; + version = "unstable-2020-10-20"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "usbboot"; - rev = "c650cd747c1d0597487dcf319bf95b5ba775d78b"; - sha256 = "17kapny79dh05vfmrniqdvz6xhpwnqnw0511ycfx4qcjh4krxh8n"; + rev = "d3760e119385a179765f43a50a8e051a44127c25"; + sha256 = "0vygzh2h27xplqp1x4isj6kgrgmvmvc1mr3ghmsi98kzp91w772r"; }; nativeBuildInputs = [ libusb1 ]; @@ -26,11 +24,11 @@ in stdenv.mkDerivation { cp -r msd $out/share/rpiboot ''; - meta = { + meta = with stdenv.lib; { homepage = "https://github.com/raspberrypi/usbboot"; description = "Utility to boot a Raspberry Pi CM/CM3/Zero over USB"; - maintainers = [ stdenv.lib.maintainers.cartr ]; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = licenses.asl20; + maintainers = with maintainers; [ cartr ]; + platforms = [ "aarch64-linux" "armv7l-linux" "armv6l-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/ocaml-modules/biocaml/default.nix b/pkgs/development/ocaml-modules/biocaml/default.nix index b7cab4cef6d11..c85886c73de43 100644 --- a/pkgs/development/ocaml-modules/biocaml/default.nix +++ b/pkgs/development/ocaml-modules/biocaml/default.nix @@ -4,25 +4,19 @@ buildDunePackage rec { pname = "biocaml"; - version = "0.10.1"; + version = "0.11.1"; useDune2 = true; - minimumOCamlVersion = "4.07"; + minimumOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "biocaml"; repo = pname; rev = "v${version}"; - sha256 = "1f19nc8ld0iv45jjnsvaah3ddj88s2n9wj8mrz726kzg85cfr8xj"; + sha256 = "1il84vvypgkhdyc2j5fmgh14a58069s6ijbd5dvyl2i7jdxaazji"; }; - # fix compilation without and disable -unsafe-string, needed for Ocaml 4.10: - patches = [ (fetchpatch { - url = "https://github.com/biocaml/biocaml/commit/597fa7b0d203684e45ffe03f56c74335b6173ffc.patch"; - sha256 = "0b8jdg215cv2k4y3ww7vak2ag5v6v9w8b76qjivr5d1qxz47mqxv"; - }) ]; - buildInputs = [ ppx_jane ppx_sexp_conv ]; checkInputs = [ ounit ]; propagatedBuildInputs = [ async base64 camlzip cfstream core rresult uri xmlm ]; diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix index 78ca63ab90c22..197a3eaf69dd7 100644 --- a/pkgs/development/ocaml-modules/bistro/default.nix +++ b/pkgs/development/ocaml-modules/bistro/default.nix @@ -15,15 +15,22 @@ buildDunePackage rec { sha256 = "114gq48cpj2mvycypa9lfyqqb26wa2gkdfwkcqhnx7m6sdwv9a38"; }; + patches = [ # The following patch adds support for core.v0.13 - patches = [(fetchpatch { + (fetchpatch { url = "https://github.com/pveber/bistro/commit/0931db43a146ad7829dff5120161a775f732a878.patch"; sha256 = "06y0sxbbab1mssc1xfjjv12lpv4rny5iqv9qkdqyzrvzpl1bdvnd"; - })]; + }) + # The following patch adds support for core.v0.14 + (fetchpatch { + url = "https://github.com/pveber/bistro/commit/afbdcb2af7777ef7711c7f3c45dff605350a27b2.patch"; + sha256 = "0ix6lx9qjnn3vqp0164c6l5an8b4rq69h2mxrg89piyk2g1yv0zg"; + }) + ]; propagatedBuildInputs = [ base64 bos core lwt_react ocamlgraph rresult tyxml ]; - minimumOCamlVersion = "4.07"; + minimumOCamlVersion = "4.08"; meta = { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix index 0ec1949f56271..d0fcf5be83ccc 100644 --- a/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/pkgs/development/ocaml-modules/cfstream/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "cfstream"; version = "1.3.1"; + useDune2 = true; + minimumOCamlVersion = "4.04.1"; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/janestreet/0.13.nix b/pkgs/development/ocaml-modules/janestreet/0.13.nix deleted file mode 100644 index 9ab45aa5b30d8..0000000000000 --- a/pkgs/development/ocaml-modules/janestreet/0.13.nix +++ /dev/null @@ -1,601 +0,0 @@ -{ janePackage -, ctypes -, dune-configurator -, num -, octavius -, ppxlib -, re -, openssl -, zarith -}: - -rec { - - ocaml-compiler-libs = janePackage { - pname = "ocaml-compiler-libs"; - version = "0.12.1"; - hash = "0hpk54fcsfcjp536fgwr80mjjf88hjk58q7jwnyrhk2ljd8xzgiv"; - meta.description = "OCaml compiler libraries repackaged"; - }; - - sexplib0 = janePackage { - pname = "sexplib0"; - hash = "1b1bk0xs1hqa12qs5y4h1yl3mq6xml4ya2570dyhdn1j0fbw4g3y"; - meta.description = "Library containing the definition of S-expressions and some base converters"; - }; - - base = janePackage { - pname = "base"; - version = "0.13.1"; - hash = "08a5aymcgr5svvm8v0v20msd5cad64m6maakfbhz4172g7kd9jzw"; - meta.description = "Full standard library replacement for OCaml"; - propagatedBuildInputs = [ sexplib0 ]; - }; - - stdio = janePackage { - pname = "stdio"; - hash = "1hkj9vh8n8p3n5pvx7053xis1pfmqd8p7shjyp1n555xzimfxzgh"; - meta.description = "Standard IO library for OCaml"; - propagatedBuildInputs = [ base ]; - }; - - ppx_sexp_conv = janePackage { - pname = "ppx_sexp_conv"; - hash = "0jkhwmkrfq3ss6bv6i3m871alcr4xpngs6ci6bmzv3yfl7s8bwdf"; - meta.description = "[@@deriving] plugin to generate S-expression conversion functions"; - propagatedBuildInputs = [ ppxlib ]; - }; - - ppx_here = janePackage { - pname = "ppx_here"; - hash = "1ahidrrjsyi0al06bhv5h6aqmdk7ryz8dybfhqjsn1zp9q056q35"; - meta.description = "Expands [%here] into its location"; - propagatedBuildInputs = [ ppxlib ]; - }; - - ppx_compare = janePackage { - pname = "ppx_compare"; - hash = "14pnqa47gsvq93z1b8wb5pyq8zw90aaw71j4pwlyid4s86px454j"; - meta.description = "Generation of comparison functions from types"; - propagatedBuildInputs = [ ppxlib ]; - }; - - ppx_cold = janePackage { - pname = "ppx_cold"; - hash = "0wnfwsgbzk4i5aqjlcaqp6lkvrq5345vazryvx2klbbrd4759h9f"; - meta.description = "Expands [@cold] into [@inline never][@specialise never][@local never]"; - propagatedBuildInputs = [ ppxlib ]; - }; - - ppx_assert = janePackage { - pname = "ppx_assert"; - hash = "08dada2xcp3w5mir90z56qrdyd317lygml4qlfssj897534bwiqr"; - meta.description = "Assert-like extension nodes that raise useful errors on failure"; - propagatedBuildInputs = [ ppx_cold ppx_compare ppx_here ppx_sexp_conv ]; - }; - - ppx_inline_test = janePackage { - pname = "ppx_inline_test"; - hash = "135qzbhqy33lmigbq1rakr9i3y59y3pczh4laanqjyss9b9kfs60"; - meta.description = "Syntax extension for writing in-line tests in ocaml code"; - propagatedBuildInputs = [ ppxlib ]; - }; - - ppx_custom_printf = janePackage { - pname = "ppx_custom_printf"; - hash = "0kvfkdk4wg2z8x705bajvl1f8wiyy3aya203wdzc9425h73nqm5p"; - meta.description = "Printf-style format-strings for user-defined string conversion"; - propagatedBuildInputs = [ ppx_sexp_conv ]; - }; - - fieldslib = janePackage { - pname = "fieldslib"; - hash = "0nsl0i9vjk73pr70ksxqa65rd5v84jzdaazryfdy6i4a5sfg7bxa"; - meta.description = "Syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; - propagatedBuildInputs = [ base ]; - }; - - ppx_fields_conv = janePackage { - pname = "ppx_fields_conv"; - hash = "0biw0fgphj522bj9wgjk263i2w92vnpaabzr5zn0grihp4yqy8w4"; - meta.description = "Generation of accessor and iteration functions for ocaml records"; - propagatedBuildInputs = [ fieldslib ppxlib ]; - }; - - variantslib = janePackage { - pname = "variantslib"; - hash = "04nps65v1n0nv9n1c1kj5k9jyqsfsxb6h2w3vf6cibhjr5m7z8xc"; - meta.description = "Part of Jane Street's Core library"; - propagatedBuildInputs = [ base ]; - }; - - ppx_variants_conv = janePackage { - pname = "ppx_variants_conv"; - hash = "1ssinizz11bws06qzjky486cj1zrflij1f7hi16d02j40qmyjz7b"; - meta.description = "Generation of accessor and iteration functions for ocaml variant types"; - propagatedBuildInputs = [ variantslib ppxlib ]; - }; - - ppx_expect = janePackage { - pname = "ppx_expect"; - hash = "1hhcga960wjvhcx5pk7rcywl1p9n2ycvqa294n24m8dhzqia6i47"; - meta.description = "Cram like framework for OCaml"; - propagatedBuildInputs = [ ppx_assert ppx_custom_printf ppx_fields_conv ppx_inline_test ppx_variants_conv re ]; - }; - - ppx_enumerate = janePackage { - pname = "ppx_enumerate"; - hash = "0hsg6f2nra1mb35jdgym5rf7spm642bs6qqifbikm9hg8f7z3ql4"; - meta.description = "Generate a list containing all values of a finite type"; - propagatedBuildInputs = [ ppxlib ]; - }; - - ppx_hash = janePackage { - pname = "ppx_hash"; - hash = "1f7mfyx4wgk67hchi57w3142m61ka3vgy1969cbkwr3akv6ifly2"; - meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions"; - propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ]; - }; - - ppx_js_style = janePackage { - pname = "ppx_js_style"; - hash = "1zlhcn0an5k9xjymk5z5m2vqi8zajy6nvcbl5sdn19pjl3zv645x"; - meta.description = "Code style checker for Jane Street Packages"; - propagatedBuildInputs = [ octavius ppxlib ]; - }; - - ppx_base = janePackage { - pname = "ppx_base"; - hash = "0dkqc85x7bgbb6lgx9rghvj1q4dpdgy9qgjl88ywi4c8l9rgnnkz"; - meta.description = "Base set of ppx rewriters"; - propagatedBuildInputs = [ ppx_cold ppx_enumerate ppx_hash ppx_js_style ]; - }; - - ppx_bench = janePackage { - pname = "ppx_bench"; - hash = "0snmy05d3jgihmppixx3dzamkykijqa2v43vpd7q4z8dpnip620g"; - meta.description = "Syntax extension for writing in-line benchmarks in ocaml code"; - propagatedBuildInputs = [ ppx_inline_test ]; - }; - - ppx_sexp_message = janePackage { - pname = "ppx_sexp_message"; - hash = "03jhx3ajcv22iwxkg1jf1jjvd14gyrwi1yc6c5ryqi5ha0fywfw6"; - meta.description = "A ppx rewriter for easy construction of s-expressions"; - propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; - }; - - splittable_random = janePackage { - pname = "splittable_random"; - hash = "1kgcd6k31vsd7638g8ip77bp1b7vzgkbvgvij4jm2igl09132r85"; - meta.description = "PRNG that can be split into independent streams"; - propagatedBuildInputs = [ base ppx_assert ppx_bench ppx_sexp_message ]; - }; - - ppx_let = janePackage { - pname = "ppx_let"; - hash = "0qplsvbv10h7kwf6dhhgvi001gfphv1v66s83zjr5zbypyaarg5y"; - meta.description = "Monadic let-bindings"; - propagatedBuildInputs = [ ppxlib ]; - }; - - base_quickcheck = janePackage { - pname = "base_quickcheck"; - hash = "0ik8llm01m2xap4gia0vpsh7yq311hph7a2kf5109ag4988s8p0w"; - meta.description = "Randomized testing framework, designed for compatibility with Base"; - propagatedBuildInputs = [ ppx_base ppx_fields_conv ppx_let splittable_random ]; - }; - - ppx_stable = janePackage { - pname = "ppx_stable"; - hash = "0h7ls1bs0bsd8c4na4aj0nawwhvfy50ybm7sza7yz3qli9jammjk"; - meta.description = "Stable types conversions generator"; - propagatedBuildInputs = [ ppxlib ]; - }; - - bin_prot = janePackage { - pname = "bin_prot"; - hash = "1nnr21rljlfglmhiji27d7c1d6gg5fk4cc5rl3750m98w28mfdjw"; - meta.description = "A binary protocol generator"; - propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ]; - }; - - ppx_bin_prot = janePackage { - pname = "ppx_bin_prot"; - hash = "14nfjgqisdqqg8wg4qzvc859zil82y0qpr8fm4nhq05mgxp37iyc"; - meta.description = "Generation of bin_prot readers and writers from types"; - propagatedBuildInputs = [ bin_prot ppx_here ]; - }; - - ppx_fail = janePackage { - pname = "ppx_fail"; - hash = "165mikjg4a1lahq3n9q9y2h36jbln5g3l2hapx17irvf0l0c3vn5"; - meta.description = "Add location to calls to failwiths"; - propagatedBuildInputs = [ ppx_here ]; - }; - - jst-config = janePackage { - pname = "jst-config"; - hash = "15lj6f83hz555xhjy9aayl3adqwgl1blcjnja693a1ybi3ca8w0y"; - meta.description = "Compile-time configuration for Jane Street libraries"; - buildInputs = [ ppx_assert ]; - }; - - ppx_optcomp = janePackage { - pname = "ppx_optcomp"; - hash = "13db395swqf7v87pgl9qiyj4igmvj57hpl8blx3kkrzj6ddh38a8"; - meta.description = "Optional compilation for OCaml"; - propagatedBuildInputs = [ ppxlib ]; - }; - - jane-street-headers = janePackage { - pname = "jane-street-headers"; - hash = "1qjg2ari0xn40dlbk0h9xkwr37k97ldkxpkv792fbl6wc2jlv3x5"; - meta.description = "Jane Street C header files"; - }; - - time_now = janePackage { - pname = "time_now"; - hash = "1if234kz1ssmv22c0vh1cwhbivab6yy3xvy37ny1q4k5ibjc3v0n"; - meta.description = "Reports the current time"; - buildInputs = [ jst-config ppx_optcomp ]; - propagatedBuildInputs = [ jane-street-headers base ppx_base ]; - }; - - ppx_module_timer = janePackage { - pname = "ppx_module_timer"; - hash = "13kv5fzwf41wsaksj41hnvcpx8pnbmzcainlq6f5shj9671hpnhb"; - meta.description = "Ppx rewriter that records top-level module startup times"; - propagatedBuildInputs = [ time_now ]; - }; - - ppx_optional = janePackage { - pname = "ppx_optional"; - hash = "1nwb9jvmszxddj9wxgv9g02qhr10yymm2q1w1gjfqd97m2m1mx4n"; - meta.description = "Pattern matching on flat options"; - propagatedBuildInputs = [ ppxlib ]; - }; - - ppx_pipebang = janePackage { - pname = "ppx_pipebang"; - hash = "0ybj0flsi95pf13ayzz1lcrqhqvkv1lm2dz6y8w49f12583496mc"; - meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`"; - propagatedBuildInputs = [ ppxlib ]; - }; - - ppx_sexp_value = janePackage { - pname = "ppx_sexp_value"; - hash = "18k5015awv9yjl44cvdmp3pn894cgsxmn5s7picxapm9675xqcg9"; - meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values"; - propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; - }; - - typerep = janePackage { - pname = "typerep"; - hash = "116hlifww2cqq1i9vwpl7ziwkc1na7p9icqi9srpdxnvn8ibcsas"; - meta.description = "Typerep is a library for runtime types"; - propagatedBuildInputs = [ base ]; - }; - - ppx_typerep_conv = janePackage { - pname = "ppx_typerep_conv"; - hash = "1jlmga9i79inr412l19n4vvmgafzp1bznqxwhy42x309wblbhxx9"; - meta.description = "Generation of runtime types from type declarations"; - propagatedBuildInputs = [ ppxlib typerep ]; - }; - - ppx_jane = janePackage { - pname = "ppx_jane"; - hash = "1a86rvnry8lvjhsg2k73f5bgz7l2962k5i49yzmzn8w66kj0yz60"; - meta.description = "Standard Jane Street ppx rewriters"; - propagatedBuildInputs = [ base_quickcheck ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_sexp_value ppx_stable ppx_typerep_conv ]; - }; - - base_bigstring = janePackage { - pname = "base_bigstring"; - hash = "1i3zr8bn71l442vl5rrvjpwphx20frp2vaw1qc05d348j76sxfp7"; - meta.description = "String type based on [Bigarray], for use in I/O and C-bindings"; - propagatedBuildInputs = [ ppx_jane ]; - }; - - parsexp = janePackage { - pname = "parsexp"; - hash = "0fsxy5lpsvfadj8m2337j8iprs294dfikqxjcas7si74nskx6l38"; - meta.description = "S-expression parsing library"; - propagatedBuildInputs = [ base sexplib0 ]; - }; - - sexplib = janePackage { - pname = "sexplib"; - hash = "059ypcyirw00x6dqa33x49930pwxcr3i72qz5pf220js2ai2nzhn"; - meta.description = "Library for serializing OCaml values to and from S-expressions"; - propagatedBuildInputs = [ num parsexp ]; - }; - - core_kernel = janePackage { - version = "0.13.1"; - pname = "core_kernel"; - hash = "1ynyz6jkf23q0cwbn6kv06mgyjd644qxb0qkrydq0cglcaa4kjhp"; - meta.description = "System-independent part of Core"; - buildInputs = [ jst-config ]; - propagatedBuildInputs = [ base_bigstring sexplib ]; - }; - - spawn = janePackage { - pname = "spawn"; - hash = "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf"; - meta.description = "Spawning sub-processes"; - buildInputs = [ ppx_expect ]; - }; - - core = janePackage { - pname = "core"; - hash = "1i5z9myl6i7axd8dz4b71gdsz9la6k07ib9njr4bn12yn0y76b1m"; - meta.description = "System-independent part of Core"; - buildInputs = [ jst-config ]; - propagatedBuildInputs = [ core_kernel spawn ]; - }; - - async_kernel = janePackage { - pname = "async_kernel"; - hash = "1rrbyy3pyh31qwv0jiarhpgdyq2z2gx6axmaplgpxshk4qx6gsld"; - meta.description = "Monadic concurrency library"; - propagatedBuildInputs = [ core_kernel ]; - }; - - protocol_version_header = janePackage { - pname = "protocol_version_header"; - hash = "19wscd81jlj355f9din1sg21m3af456a0id2a37bx38r390wrghc"; - meta.description = "Protocol versioning"; - propagatedBuildInputs = [ core_kernel ]; - }; - - async_rpc_kernel = janePackage { - pname = "async_rpc_kernel"; - hash = "1k3f2psyd1xcf7nkk0q1fq57yyhfqbzyynsz821n7mrnm37simac"; - meta.description = "Platform-independent core of Async RPC library"; - propagatedBuildInputs = [ async_kernel protocol_version_header ]; - }; - - async_unix = janePackage { - pname = "async_unix"; - version = "0.13.1"; - hash = "1sb8grbj4bv6ih3yfdihxhn5c9rqczr56b5bhl85wy2mi92m17xv"; - meta.description = "Monadic concurrency library"; - propagatedBuildInputs = [ async_kernel core ]; - }; - - async_extra = janePackage { - pname = "async_extra"; - hash = "06q1farx7dwi4h490xi1azq7ym57ih2d23sq17g2jfvw889kf4n1"; - meta.description = "Monadic concurrency library"; - propagatedBuildInputs = [ async_rpc_kernel async_unix ]; - }; - - textutils = janePackage { - pname = "textutils"; - hash = "1wnyqj9dzfgl0kddmdl4n9rkl16hwy432dd2i4ksvk2z5g9kkb0d"; - meta.description = "Text output utilities"; - propagatedBuildInputs = [ core ]; - }; - - async = janePackage { - pname = "async"; - hash = "002j9yxpw0ghi12a84163vaqa3n9h8j35f4i72nbxnilxwvy95sr"; - meta.description = "Monadic concurrency library"; - propagatedBuildInputs = [ async_rpc_kernel async_unix textutils ]; - }; - - async_find = janePackage { - pname = "async_find"; - hash = "0l8cfhyrx2rb2avdcfx5m70aj6rx2d57qxqvfycad5afqz4xx2n9"; - meta.description = "Directory traversal with Async"; - propagatedBuildInputs = [ async ]; - }; - - async_interactive = janePackage { - pname = "async_interactive"; - hash = "1ma24pi3hqzrs1k12sc0aarhf42fap8nl1h7id6k01wp6s3yqi5d"; - meta.description = "Utilities for building simple command-line based user interfaces"; - propagatedBuildInputs = [ async ]; - }; - - re2 = janePackage { - pname = "re2"; - hash = "0hmizznlzilynn5kh6149bbpkfw2l0xi7zi1y1fxfww2ma3wpim0"; - meta.description = "OCaml bindings for RE2, Google's regular expression library"; - propagatedBuildInputs = [ core_kernel ]; - prePatch = '' - substituteInPlace src/re2_c/dune --replace 'CXX=g++' 'CXX=c++' - substituteInPlace src/dune --replace '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2))' '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2) (-x c++))' - ''; - }; - - shell = janePackage { - pname = "shell"; - hash = "190ymhm0z9b7hngbcpg88wwrfxwfcdh339d7rd2xhmrhi4z99r18"; - meta.description = "Yet another implementation of fork&exec and related functionality"; - buildInputs = [ jst-config ]; - propagatedBuildInputs = [ re2 textutils ]; - }; - - async_shell = janePackage { - pname = "async_shell"; - hash = "0bfxyvdmyv23zfr49pb4c3bgfkjr4s3nb3z07xrw6szia3j1kp4j"; - meta.description = "Shell helpers for Async"; - propagatedBuildInputs = [ async shell ]; - }; - - async_ssl = janePackage { - pname = "async_ssl"; - useDune2 = true; - hash = "0z5dbiam5k7ipx9ph4r8nqv0a1ldx1ymxw3xjxgrdjda90lmwf2k"; - meta.description = "Async wrappers for SSL"; - buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ async ctypes openssl ]; - }; - - core_bench = janePackage { - pname = "core_bench"; - hash = "1nk0i3z8rqrljbf4bc7ljp71g0a4361nh85s2ang0lgxri74zacm"; - meta.description = "Benchmarking library"; - propagatedBuildInputs = [ textutils ]; - }; - - core_extended = janePackage { - pname = "core_extended"; - hash = "0zh1wwkg5cxkz633dl9zbbl65aksvzb5mss1q8f7w6i1sv3n0135"; - meta.description = "Extra components that are not as closely vetted or as stable as Core"; - propagatedBuildInputs = [ core ]; - }; - - sexp_pretty = janePackage { - pname = "sexp_pretty"; - hash = "1a59xc9frmvi7n0i32dzs8gpf5ral80xkwv97a13zv5cyg8l6216"; - meta.description = "S-expression pretty-printer"; - propagatedBuildInputs = [ ppx_base re sexplib ]; - }; - - expect_test_helpers_kernel = janePackage { - pname = "expect_test_helpers_kernel"; - hash = "11m0i7mj6b1cmqnwhmsrqdc814s0lk3sip8rh97k75grngazmjvn"; - meta.description = "Helpers for writing expectation tests"; - buildInputs = [ ppx_jane ]; - propagatedBuildInputs = [ core_kernel sexp_pretty ]; - }; - - expect_test_helpers = janePackage { - pname = "expect_test_helpers"; - hash = "0sw9yam8d9hdam8p194q0hgc4i26vvwj5qi2cba1jxfhdzhy8jdd"; - meta.description = "Async helpers for writing expectation tests"; - propagatedBuildInputs = [ async expect_test_helpers_kernel ]; - }; - - patience_diff = janePackage { - pname = "patience_diff"; - hash = "012rlbnw21yq2lsbfk3f7l4m4qq3jdx238146z36v54vnhhs6r2r"; - meta.description = "Diff library using Bram Cohen's patience diff algorithm"; - propagatedBuildInputs = [ core_kernel ]; - }; - - ecaml = janePackage { - pname = "ecaml"; - hash = "0jmmsi1m7d4cl5mnw6v9h4ng29anwxy73a6qfi28lgpzafn452bc"; - meta.description = "Library for writing Emacs plugin in OCaml"; - propagatedBuildInputs = [ async expect_test_helpers_kernel ]; - }; - - posixat = janePackage { - pname = "posixat"; - hash = "122fmd6v7fhiiivkxra539b5w3p5xkkd8mcjzvyb2msyq5zc6xa2"; - propagatedBuildInputs = [ ppx_optcomp ppx_sexp_conv ]; - meta.description = "Binding to the posix *at functions"; - }; - - shexp = janePackage { - pname = "shexp"; - hash = "0zdcyix0gdn4xmvbjzhbig63xw9jnw8ixj3ngs6g4k2vk77rs0gk"; - propagatedBuildInputs = [ posixat spawn ]; - meta.description = "Process library and s-expression based shell"; - }; - - csvfields = janePackage { - pname = "csvfields"; - hash = "19pnq9m9lkdgqfy9l21w779d6c8djr1dvvjq7r9kbgfwb04symmr"; - propagatedBuildInputs = [ core expect_test_helpers ]; - meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv"; - }; - - sexp_diff_kernel = janePackage { - pname = "sexp_diff_kernel"; - hash = "125gssd24vfcfbkpjlqbxijlc4jyw2n0wv1cnddcfvpn1f7cghzb"; - propagatedBuildInputs = [ core_kernel ]; - meta.description = "Code for computing the diff of two sexps"; - }; - - sexp_macro = janePackage { - pname = "sexp_macro"; - hash = "1rqs2r2ihwsqzgnqsdr0db6dqzz4q6s9hi1hvnwf0cb2vnkhsjln"; - propagatedBuildInputs = [ async sexplib ]; - meta.description = "Sexp macros"; - }; - - sexp_select = janePackage { - pname = "sexp_select"; - hash = "02yckmin937scqs2i45r2qqp56rqa6j2q04nfhnnxvn3bkb0qnb1"; - propagatedBuildInputs = [ base ppx_jane ]; - meta.description = "A library to use CSS-style selectors to traverse sexp trees"; - }; - - sexp = janePackage { - pname = "sexp"; - hash = "0cqp6syc4ap2nxgg1mvwwz2pmib48kp3gigzpjwh20wr38qq0p1r"; - propagatedBuildInputs = [ - async - core - csvfields - re2 - sexp_diff_kernel - sexp_macro - sexp_pretty - sexp_select - ]; - patches = ./sexp.patch; - meta.description = "S-expression swiss knife"; - }; - - zarith_stubs_js = janePackage { - pname = "zarith_stubs_js"; - hash = "0dldnf85rfyx8z63qjly9n8plj8nnkw4i5zrj5vbm7s2wjcfjzj1"; - meta.description = "Javascripts stubs for the Zarith library"; - }; - - bignum = janePackage { - pname = "bignum"; - hash = "0qldyl5mhlffnyps7n9y8qykm0ylrdiw5ii8zlww82zmmpp8zv5x"; - propagatedBuildInputs = [ core_kernel zarith zarith_stubs_js ]; - meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals"; - }; - - delimited_parsing = janePackage { - pname = "delimited_parsing"; - hash = "0siz746q28241wk0sv435lfvvips7sl151z5a1sbqanr3lm4s17w"; - propagatedBuildInputs = [ async core_extended ]; - meta.description = "Parsing of character (e.g., comma) separated and fixed-width values"; - }; - - ### Packages at version 0.11, with dependencies at version 0.12 - - configurator = janePackage { - pname = "configurator"; - version = "0.11.0"; - hash = "0h686630cscav7pil8c3w0gbh6rj4b41dvbnwmicmlkc746q5bfk"; - propagatedBuildInputs = [ stdio ]; - meta.description = "Helper library for gathering system configuration"; - }; - - ppx_core = janePackage { - pname = "ppx_core"; - version = "0.11.0"; - hash = "11hgm9mxig4cm3c827f6dns9mjv3pf8g6skf10x0gw9xnp1dmzmx"; - propagatedBuildInputs = [ ppxlib ]; - meta.description = "Deprecated (see ppxlib)"; - }; - - ppx_driver = janePackage { - pname = "ppx_driver"; - version = "0.11.0"; - hash = "00kfx6js2kxk57k4v7hiqvwk7h35whgjihnxf75m82rnaf4yzvfi"; - propagatedBuildInputs = [ ppxlib ]; - meta.description = "Deprecated (see ppxlib)"; - }; - - ppx_type_conv = janePackage { - pname = "ppx_type_conv"; - version = "0.11.0"; - hash = "04dbrglqqhkas25cpjz8xhjcbpk141c35qggzw66bn69izczfmaf"; - propagatedBuildInputs = [ ppxlib ]; - meta.description = "Deprecated (see ppxlib)"; - }; - -} diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix new file mode 100644 index 0000000000000..29b18e0bf9807 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -0,0 +1,857 @@ +{ janePackage +, alcotest +, angstrom +, angstrom-async +, base64 +, cryptokit +, ctypes +, dune-configurator +, faraday +, inotify +, js_of_ocaml +, js_of_ocaml-ppx +, lambdasoup +, magic-mime +, num +, octavius +, ppxlib +, re +, tyxml +, uri-sexp +, zarith +, openssl +, ounit +, zstd +}: + +rec { + + accessor = janePackage { + pname = "accessor"; + version = "0.14.1"; + minimumOCamlVersion = "4.09"; + hash = "0wm2081kzd5zsqs516cn3f975bnnmnyynv8fa818gmfa65i6mxm8"; + meta.description = "A library that makes it nicer to work with nested functional data structures"; + propagatedBuildInputs = [ higher_kinded ]; + }; + + accessor_async = janePackage { + pname = "accessor_async"; + version = "0.14.1"; + minimumOCamlVersion = "4.09"; + hash = "1193hzvlzm7vcl9p67fs8al2pvkw9n2wz009m2l3lp35mrx8aq1w"; + meta.description = "Accessors for Async types, for use with the Accessor library"; + propagatedBuildInputs = [ accessor_core async_kernel ]; + }; + + accessor_base = janePackage { + pname = "accessor_base"; + version = "0.14.1"; + minimumOCamlVersion = "4.09"; + hash = "1xjbvvijkyw4dlys47x4896y3kqm2zn0yg60cqrp57i2dwxg0nsj"; + meta.description = "Accessors for Base types, for use with the Accessor library"; + propagatedBuildInputs = [ ppx_accessor ]; + }; + + accessor_core = janePackage { + minimumOCamlVersion = "4.09"; + pname = "accessor_core"; + version = "0.14.1"; + hash = "1cdkv34m6czhacivpbb2sasj83fgcid6gnqk30ig9i84z8nh2gw2"; + meta.description = "Accessors for Core types, for use with the Accessor library"; + propagatedBuildInputs = [ accessor_base core_kernel ]; + }; + + async = janePackage { + pname = "async"; + hash = "086v93div4h9l02n7wzv3xx3i6xvddazydm9qlfa72ad55x3vzy0"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_rpc_kernel async_unix textutils ]; + doCheck = false; # we don't have netkit_sockets + }; + + async_extra = janePackage { + pname = "async_extra"; + hash = "16cnz9h4jkc3b0837s5z0iv92q7n5nw77g8qshq8pwq639y8ail4"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_kernel ]; + }; + + async_find = janePackage { + pname = "async_find"; + hash = "0vlcpdr15bgrwrmixvs6ij88kvk8vzzrijz3zm0svxih0naf8ylx"; + meta.description = "Directory traversal with Async"; + propagatedBuildInputs = [ async ]; + }; + + async_inotify = janePackage { + pname = "async_inotify"; + hash = "0i0hf7nsir316ijixdj43qf0p3b6yapvcm2jzp7bhpf4r2kxislv"; + meta.description = "Async wrapper for inotify"; + propagatedBuildInputs = [ async_find inotify ]; + }; + + async_interactive = janePackage { + pname = "async_interactive"; + hash = "1cnmv9mipa6k6xd303ngdbxmiab2202f3w3pgq8l1970w8hb78il"; + meta.description = "Utilities for building simple command-line based user interfaces"; + propagatedBuildInputs = [ async ]; + }; + + async_js = janePackage { + pname = "async_js"; + hash = "0rld8792lfwbinn9rhrgacivz49vppgy29smpqnvpga89wchjv0v"; + meta.description = "A small library that provide Async support for JavaScript platforms"; + buildInputs = [ js_of_ocaml-ppx ]; + propagatedBuildInputs = [ async_rpc_kernel js_of_ocaml uri-sexp ]; + }; + + async_kernel = janePackage { + pname = "async_kernel"; + hash = "17giakwl0xhyxvxrkn12dwjdghc53q8px81z7cc3k6f102bsbdy6"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ core_kernel ]; + }; + + async_rpc_kernel = janePackage { + pname = "async_rpc_kernel"; + hash = "1bwq3gkq057dd1fhrqz9kqq8a956nn87zaxvr0qcpiczzjv3zmvm"; + meta.description = "Platform-independent core of Async RPC library"; + propagatedBuildInputs = [ async_kernel protocol_version_header ]; + }; + + async_sendfile = janePackage { + pname = "async_sendfile"; + hash = "1w3gwwpgfzqjhblxnxh64g64q6kgjzzxx90inswfhycc88pnvdna"; + meta.description = "Thin wrapper around [Linux_ext.sendfile] to send full files"; + propagatedBuildInputs = [ async_unix ]; + }; + + async_shell = janePackage { + pname = "async_shell"; + hash = "1r00z620nqv2jxz2xrp2gsyc30h8dd2w9qsnys2fkqbgpxlbgdc7"; + meta.description = "Shell helpers for Async"; + propagatedBuildInputs = [ async shell ]; + }; + + async_smtp = janePackage { + pname = "async_smtp"; + hash = "1xf3illn7vikdxldpnc29n4z8sv9f0wsdgdvl4iv93qlvjk8gzck"; + meta.description = "SMTP client and server"; + propagatedBuildInputs = [ async_extra async_inotify async_sendfile async_shell async_ssl email_message resource_cache re2_stable sexp_macro ]; + }; + + async_ssl = janePackage { + pname = "async_ssl"; + hash = "0ykys3ckpsx5crfgj26v2q3gy6wf684aq0bfb4q8p92ivwznvlzy"; + meta.description = "Async wrappers for SSL"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ async ctypes openssl ]; + }; + + async_unix = janePackage { + pname = "async_unix"; + hash = "1wgnr0vdsknqrfnf6irmwnvyngndsnvvl1sfnj3v6fhwk4nswnrs"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_kernel core ]; + }; + + base = janePackage { + pname = "base"; + hash = "1d5ynzzq58g9qammhba5dasrg734p9vndq28a7kg80bdxb8gh3kp"; + minimumOCamlVersion = "4.07"; + meta.description = "Full standard library replacement for OCaml"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ sexplib0 ]; + checkInputs = [ alcotest ]; + }; + + base_bigstring = janePackage { + pname = "base_bigstring"; + hash = "1ald2m7qywhxbygv58dzpgaj54p38zn0aiqd1z7i95kf3bsnsjqa"; + minimumOCamlVersion = "4.07"; + meta.description = "String type based on [Bigarray], for use in I/O and C-bindings"; + propagatedBuildInputs = [ ppx_jane ]; + }; + + base_quickcheck = janePackage { + pname = "base_quickcheck"; + hash = "1lmp1h68g0gqiw8m6gqcbrp0fn76nsrlsqrwxp20d7jhh0693f3j"; + 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 ]; + }; + + bignum = janePackage { + pname = "bignum"; + hash = "009ygr64q810p9iq4mykzz4ci00i5mzgpmq35jiyaiqm27bjam21"; + propagatedBuildInputs = [ core_kernel zarith zarith_stubs_js ]; + meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals"; + }; + + bin_prot = janePackage { + pname = "bin_prot"; + hash = "1qyqbfp4zdc2jb87370cdgancisqffhf9x60zgh2m31kqik8annr"; + minimumOCamlVersion = "4.04.2"; + meta.description = "A binary protocol generator"; + propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_optcomp ppx_variants_conv ]; + }; + + bonsai = janePackage { + pname = "bonsai"; + hash = "0k4grabwqc9sy4shzp77bgfvyajvvc0l8qq89ia7cvlwvly7gv6a"; + meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; + buildInputs = [ ppx_pattern_bind ]; + propagatedBuildInputs = [ incr_dom ]; + }; + + cinaps = janePackage { + pname = "cinaps"; + hash = "0ms1j2kh7i5slyw9v4w9kdz52dkwl5gqcnvn89prgimhk2vmichj"; + minimumOCamlVersion = "4.07"; + meta.description = "Trivial metaprogramming tool"; + propagatedBuildInputs = [ re ]; + checkInputs = [ ppx_jane ]; + }; + + core = janePackage { + pname = "core"; + hash = "1m9h73pk9590m8ngs1yf4xrw61maiqmi9glmlrl12qhi0wcja5f3"; + meta.description = "System-independent part of Core"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ core_kernel spawn timezone ]; + doCheck = false; # we don't have quickcheck_deprecated + }; + + core_bench = janePackage { + pname = "core_bench"; + hash = "04h6hzxk347pqyrrbgqrw9576sq4yf70fgq9xam3kajrqwdh3dhx"; + meta.description = "Benchmarking library"; + propagatedBuildInputs = [ textutils ]; + }; + + core_extended = janePackage { + pname = "core_extended"; + hash = "1pbm6xbc3h0fhrymyr1yb9b1jk7n88gfi3pylqz2cs8haxr2pb3a"; + meta.description = "Extra components that are not as closely vetted or as stable as Core"; + propagatedBuildInputs = [ core ]; + }; + + core_kernel = janePackage { + pname = "core_kernel"; + hash = "012sp02v35j41lzkvf073620602fgiswz2n224j06mk3bm8jmjms"; + meta.description = "System-independent part of Core"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ base_bigstring sexplib ]; + doCheck = false; # we don't have quickcheck_deprecated + }; + + csvfields = janePackage { + pname = "csvfields"; + hash = "09jmz6y6nwd96dcx6g8ydicxssi72v1ks276phbc9n19wwg9hkaz"; + propagatedBuildInputs = [ core num ]; + meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv"; + }; + + delimited_parsing = janePackage { + pname = "delimited_parsing"; + hash = "1dnr5wqacryx1kj38i9iifc3457pchr887xphzz2nhlbizq3d7qa"; + propagatedBuildInputs = [ async core_extended ]; + meta.description = "Parsing of character (e.g., comma) separated and fixed-width values"; + }; + + ecaml = janePackage { + pname = "ecaml"; + hash = "052qglpwzrx3c4gy3zr6dmsmfbi5gj4fs2jhx9yrsqb9hj8g36mj"; + meta.description = "Library for writing Emacs plugin in OCaml"; + propagatedBuildInputs = [ async expect_test_helpers_core ]; + }; + + email_message = janePackage { + pname = "email_message"; + hash = "0k8hjkq91ikl7wjxs04k523jbkhl6q4abj6v0lzlbjiybmrpp69n"; + meta.description = "E-mail message parser"; + propagatedBuildInputs = [ angstrom async base64 cryptokit magic-mime re2 ]; + }; + + expect_test_helpers_async = janePackage { + pname = "expect_test_helpers_async"; + hash = "175sjkx3b10d8vacp369rv53nxbiaxw1xhwy832g7ffk1by8l2m1"; + meta.description = "Async helpers for writing expectation tests"; + propagatedBuildInputs = [ async expect_test_helpers_core ]; + }; + + expect_test_helpers_core = janePackage { + pname = "expect_test_helpers_core"; + hash = "1drl15akp4jz4wf26dr2y2nblvnhz14xsnb3ai8dg45y711svs2i"; + meta.description = "Helpers for writing expectation tests"; + propagatedBuildInputs = [ core_kernel sexp_pretty ]; + }; + + fieldslib = janePackage { + pname = "fieldslib"; + hash = "0nxx35lrb4f6zfs5l80a7cg7azf19c6g31vn9qjjpaxf6lgkck2n"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; + propagatedBuildInputs = [ base ]; + }; + + higher_kinded = janePackage { + pname = "higher_kinded"; + version = "0.14.1"; + minimumOCamlVersion = "4.09"; + hash = "05jvxgqsx3j2v8rqpd91ah76dgc1q2dz38kjklmx0vms4r4gvlsx"; + meta.description = "A library with an encoding of higher kinded types in OCaml"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + incr_dom = janePackage { + pname = "incr_dom"; + hash = "0mi98cwi4npdh5vvcz0pb4sbb9j9dydl52s51rswwc3kn8mipxfx"; + meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; + buildInputs = [ js_of_ocaml-ppx ]; + propagatedBuildInputs = [ async_js incr_map incr_select virtual_dom ]; + }; + + incr_map = janePackage { + pname = "incr_map"; + hash = "0s0s7qfydvvvnqby4v5by5jdnd5kxqsdr65mhm11w4fn125skryz"; + meta.description = "Helpers for incremental operations on map like data structures"; + buildInputs = [ ppx_pattern_bind ]; + propagatedBuildInputs = [ incremental ]; + }; + + incr_select = janePackage { + pname = "incr_select"; + hash = "18ril6z57mw89gzc9zhz6p1phwm1xr6phppicvqpqmi0skvvnrg6"; + meta.description = "Handling of large set of incremental outputs from a single input"; + propagatedBuildInputs = [ incremental ]; + }; + + incremental = janePackage { + pname = "incremental"; + hash = "0nyaiy7r2spvn2ij9z5rghd5gbjk1y3ai4jn0i8q81arp7cf6zc7"; + meta.description = "Library for incremental computations"; + propagatedBuildInputs = [ core_kernel ]; + }; + + jane-street-headers = janePackage { + pname = "jane-street-headers"; + hash = "12n40mlgjnc09fxc0hp0npsxdlxja2w828683zpb32nrzqkg6z4c"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Jane Street C header files"; + }; + + jst-config = janePackage { + pname = "jst-config"; + hash = "0hzw0crgj0kjxsvr10wng7gqy948v98hnijh30lgq3v62jdsjra8"; + meta.description = "Compile-time configuration for Jane Street libraries"; + buildInputs = [ dune-configurator ppx_assert stdio ]; + }; + + ocaml-compiler-libs = janePackage { + pname = "ocaml-compiler-libs"; + version = "0.12.3"; + minimumOCamlVersion = "4.04.1"; + hash = "00nrar7h2pyflbdiq6wwwrb4k5jh9iff0jllihzm6ms8d5pspsg5"; + meta.description = "OCaml compiler libraries repackaged"; + }; + + parsexp = janePackage { + pname = "parsexp"; + hash = "0rvbrf8ggh2imsbhqi15jzyyqbi3m5hzvy2iy2r4skx6m102mzpd"; + minimumOCamlVersion = "4.04.2"; + meta.description = "S-expression parsing library"; + propagatedBuildInputs = [ base sexplib0 ]; + }; + + patience_diff = janePackage { + pname = "patience_diff"; + hash = "1np88s226ndhbwynpdqygrycahp8m1mx28f1xk54kvds8znnq2i0"; + meta.description = "Diff library using Bram Cohen's patience diff algorithm"; + propagatedBuildInputs = [ core_kernel ]; + }; + + posixat = janePackage { + pname = "posixat"; + hash = "0aana1lzq4514kna7hr301b5iv6gcg6zhgrx8s8vaad1q38yfp6c"; + minimumOCamlVersion = "4.07"; + propagatedBuildInputs = [ ppx_optcomp ppx_sexp_conv ]; + meta.description = "Binding to the posix *at functions"; + }; + + ppx_accessor = janePackage { + pname = "ppx_accessor"; + version = "0.14.2"; + minimumOCamlVersion = "4.09"; + hash = "01nifsh7gap28cpvff6i569lqr1gmyhrklkisgri538cp4pf1wq1"; + meta.description = "[@@deriving] plugin to generate accessors for use with the Accessor libraries"; + propagatedBuildInputs = [ accessor ]; + }; + + ppx_assert = janePackage { + pname = "ppx_assert"; + hash = "03mzgm4smrczp5dg3mpr6zc2v6a54n0r01k4ww820yrr25hcf8ip"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Assert-like extension nodes that raise useful errors on failure"; + propagatedBuildInputs = [ ppx_cold ppx_compare ppx_here ppx_sexp_conv ]; + }; + + ppx_base = janePackage { + pname = "ppx_base"; + hash = "1wv3q0qyghm0c5izq03y97lv3czqk116059mg62wx6valn22a000"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Base set of ppx rewriters"; + propagatedBuildInputs = [ ppx_cold ppx_enumerate ppx_hash ppx_js_style ]; + }; + + ppx_bench = janePackage { + pname = "ppx_bench"; + version = "0.14.1"; + hash = "12r7jgqgpb4i4cry3rgyl2nmxcscs5w7mmk06diz7i49r27p96im"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Syntax extension for writing in-line benchmarks in ocaml code"; + propagatedBuildInputs = [ ppx_inline_test ]; + }; + + ppx_bin_prot = janePackage { + pname = "ppx_bin_prot"; + hash = "1qryjxhyz3kn5jz5wm62j59lhjhd1mp7nbsj0np9qnbpapnnr1zg"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Generation of bin_prot readers and writers from types"; + propagatedBuildInputs = [ bin_prot ppx_here ]; + doCheck = false; # circular dependency with ppx_jane + }; + + ppx_cold = janePackage { + pname = "ppx_cold"; + hash = "0ciqs6f9ab73gq4krj14xzzba4ydcxph214m87i1s0xp25hwxr8v"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Expands [@cold] into [@inline never][@specialise never][@local never]"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_compare = janePackage { + pname = "ppx_compare"; + hash = "11pj76dimx2f7l8m85myzp6yzx9xcg0bqi97s7ayssvkckm57390"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Generation of comparison functions from types"; + propagatedBuildInputs = [ ppxlib base ]; + doCheck = false; # test build rule broken + }; + + ppx_custom_printf = janePackage { + pname = "ppx_custom_printf"; + hash = "0p9hgx0krxqw8hlzfv2bg2m3zi5nxsnzhyp0fj5936rapad02hc5"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Printf-style format-strings for user-defined string conversion"; + propagatedBuildInputs = [ ppx_sexp_conv ]; + }; + + ppx_enumerate = janePackage { + pname = "ppx_enumerate"; + hash = "1sriid4vh10p80wwvn46v1g16m646qw5r5xzwlymyz5gbvq2zf40"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Generate a list containing all values of a finite type"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_expect = janePackage { + pname = "ppx_expect"; + hash = "05v6jzn1nbmwk3vzxxnb3380wzg2nb28jpb3v5m5c4ikn0jrhcwn"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Cram like framework for OCaml"; + propagatedBuildInputs = [ ppx_here ppx_inline_test re ]; + doCheck = false; # circular dependency with ppx_jane + }; + + ppx_fields_conv = janePackage { + pname = "ppx_fields_conv"; + version = "0.14.2"; + hash = "1zwirwqry24b48bg7d4yc845hvcirxyymzbw95aaxdcck84d30n8"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Generation of accessor and iteration functions for ocaml records"; + propagatedBuildInputs = [ fieldslib ppxlib ]; + }; + + ppx_fixed_literal = janePackage { + pname = "ppx_fixed_literal"; + hash = "0s7rb4dhz4ibhh42a9sfxjj3zbwfyfmaihr92hpdv5j9xqn3n8mi"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Simpler notation for fixed point literals"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_hash = janePackage { + pname = "ppx_hash"; + hash = "1zf03xdrg4jig7pdcrdpbabyjkdpifb31z2z1bf9wfdawybdhwkq"; + minimumOCamlVersion = "4.04.2"; + meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions"; + propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ]; + }; + + ppx_here = janePackage { + pname = "ppx_here"; + hash = "09zcyigaalqccs9s0h7n0535clgfmqb9s4p1jbgcqji9zj8w426s"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Expands [%here] into its location"; + propagatedBuildInputs = [ ppxlib ]; + doCheck = false; # test build rules broken + }; + + ppx_inline_test = janePackage { + pname = "ppx_inline_test"; + version = "0.14.1"; + hash = "1ajdna1m9l1l3nfigyy33zkfa3yarfr6s086jdw2pcfwlq1fhhl4"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Syntax extension for writing in-line tests in ocaml code"; + propagatedBuildInputs = [ ppxlib time_now ]; + doCheck = false; # test build rules broken + }; + + ppx_jane = janePackage { + pname = "ppx_jane"; + hash = "1kk238fvrcylymwm7xwc7llbyspmx1y662ypq00vy70g112rir7j"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Standard Jane Street ppx rewriters"; + propagatedBuildInputs = [ base_quickcheck ppx_bin_prot ppx_expect ppx_fixed_literal ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_stable ppx_string ppx_typerep_conv ppx_variants_conv ]; + }; + + ppx_js_style = janePackage { + pname = "ppx_js_style"; + hash = "1ahk4mv63s9cw8ji62598ggw6b3lqpaljqa2ya7w91lify3lb76q"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Code style checker for Jane Street Packages"; + propagatedBuildInputs = [ octavius ppxlib ]; + }; + + ppx_let = janePackage { + pname = "ppx_let"; + hash = "1jq3g88xv9g6y9im67hiig3cfn5anwwnq09mp7yn7a86ha5r9w3i"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Monadic let-bindings"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_module_timer = janePackage { + pname = "ppx_module_timer"; + hash = "163q1rpblwv82fxwyf0p4j9zpsj0jzvkfmzb03r0l49gqhn89mp6"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Ppx rewriter that records top-level module startup times"; + propagatedBuildInputs = [ time_now ]; + }; + + ppx_optcomp = janePackage { + pname = "ppx_optcomp"; + hash = "1wav3zgh4244x1ll562g735cwwrzyk5jj72niq9jgz9qjlpsprlk"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Optional compilation for OCaml"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_optional = janePackage { + pname = "ppx_optional"; + hash = "1d7rsdqiccxp2w4ykb9klarddm2qrrym3brbnhzx2hm78iyj3hzv"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Pattern matching on flat options"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_pattern_bind = janePackage { + pname = "ppx_pattern_bind"; + hash = "0yxkwnn30nxgrspi191zma95bgrh134aqh2bnpj3wg0245ki55zv"; + minimumOCamlVersion = "4.07"; + meta.description = "A ppx for writing fast incremental bind nodes in a pattern match"; + propagatedBuildInputs = [ ppx_let ]; + }; + + ppx_pipebang = janePackage { + pname = "ppx_pipebang"; + hash = "0450b3p2rpnnn5yyvbkcd3c33jr2z0dp8blwxddaj2lv7nzl5dzf"; + minimumOCamlVersion = "4.04.2"; + meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_sexp_conv = janePackage { + pname = "ppx_sexp_conv"; + version = "0.14.1"; + minimumOCamlVersion = "4.04.2"; + hash = "04bx5id99clrgvkg122nx03zig1m7igg75piphhyx04w33shgkz2"; + meta.description = "[@@deriving] plugin to generate S-expression conversion functions"; + propagatedBuildInputs = [ ppxlib sexplib0 base ]; + }; + + ppx_sexp_message = janePackage { + pname = "ppx_sexp_message"; + hash = "17xnq345xwfkl9ydn05ljsg37m2glh3alnspayl3fgbhmcjmav3i"; + minimumOCamlVersion = "4.04.2"; + meta.description = "A ppx rewriter for easy construction of s-expressions"; + propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; + }; + + ppx_sexp_value = janePackage { + pname = "ppx_sexp_value"; + hash = "1d1c92pyypqkd9473d59j0sfppxvcxggbc62w8bkqnbxrdmvirn9"; + minimumOCamlVersion = "4.04.2"; + meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values"; + propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; + }; + + ppx_stable = janePackage { + pname = "ppx_stable"; + version = "0.14.1"; + hash = "1sp1kn23qr0pfypa4ilvhqq5y11y13xpfygfl582ra9kik5xqfa1"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Stable types conversions generator"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_string = janePackage { + pname = "ppx_string"; + version = "0.14.1"; + minimumOCamlVersion = "4.04.2"; + hash = "0a8khmg0y32kyn3q6idwgh0d6d1s6ms1w75gj3dzng0v7y4h6jx4"; + meta.description = "Ppx extension for string interpolation"; + propagatedBuildInputs = [ ppx_base ppxlib stdio ]; + }; + + ppx_typerep_conv = janePackage { + pname = "ppx_typerep_conv"; + version = "0.14.1"; + minimumOCamlVersion = "4.04.2"; + hash = "1r0z7qlcpaicas5hkymy2q0gi207814wlay4hys7pl5asd59wcdh"; + meta.description = "Generation of runtime types from type declarations"; + propagatedBuildInputs = [ ppxlib typerep ]; + }; + + ppx_variants_conv = janePackage { + pname = "ppx_variants_conv"; + version = "0.14.1"; + minimumOCamlVersion = "4.04.2"; + hash = "0q6a43zrwqzdz7aja0k44a2llyjjj5xzi2kigwhsnww3g0r5ig84"; + meta.description = "Generation of accessor and iteration functions for ocaml variant types"; + propagatedBuildInputs = [ variantslib ppxlib ]; + }; + + protocol_version_header = janePackage { + pname = "protocol_version_header"; + hash = "0lfblv2yqw01bl074ga6vxii0p9mqwlqw1g9b9z7pfdva9wqilrd"; + meta.description = "Protocol versioning"; + propagatedBuildInputs = [ core_kernel ]; + }; + + re2 = janePackage { + pname = "re2"; + hash = "1j7dizls6lkz3i9dgf8nq2fm382mfbrmz72ci066zl3hkgdq8xwc"; + meta.description = "OCaml bindings for RE2, Google's regular expression library"; + propagatedBuildInputs = [ core_kernel ]; + prePatch = '' + substituteInPlace src/re2_c/dune --replace 'CXX=g++' 'CXX=c++' + substituteInPlace src/dune --replace '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2))' '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2) (-x c++))' + ''; + }; + + re2_stable = janePackage { + pname = "re2_stable"; + hash = "0kjc0ff6b3509s3b9n4q8ilb06d5fngdh3z58cm95vg7zkcas9w3"; + meta.description = "Re2_stable adds an incomplete but stable serialization of Re2"; + propagatedBuildInputs = [ core re2 ]; + }; + + resource_cache = janePackage { + pname = "resource_cache"; + hash = "197z9s535q74h00365ydhggg7hyzpyqvislgwwyi69sl1vy6dr0j"; + meta.description = "General resource cache"; + propagatedBuildInputs = [ async_rpc_kernel ]; + }; + + sexp = janePackage { + pname = "sexp"; + hash = "1x08pyrkd78233kgj70wxlc79w6jjhfrjdamm2xr7jzdc8ycfigf"; + propagatedBuildInputs = [ + async + core + csvfields + re2 + sexp_diff_kernel + sexp_macro + sexp_pretty + sexp_select + ]; + patches = ./sexp.patch; + meta.description = "S-expression swiss knife"; + }; + + sexp_diff_kernel = janePackage { + pname = "sexp_diff_kernel"; + hash = "1pljcs019hs2ffhhb7rjh3xz7cbrk8vsv967jzmip3rv9w21c9kh"; + propagatedBuildInputs = [ core_kernel ]; + meta.description = "Code for computing the diff of two sexps"; + }; + + sexp_macro = janePackage { + pname = "sexp_macro"; + hash = "1ih1g7vpb1j8vhzm9a5mjrrzgqrhjqdhf6vjrg8kxfqg5i5b8nyx"; + propagatedBuildInputs = [ async sexplib ]; + meta.description = "Sexp macros"; + }; + + sexp_pretty = janePackage { + pname = "sexp_pretty"; + hash = "0dax0wm511zgvr7p6kcd5gygi58118by7hsv7hymy8ldfcky5cwd"; + minimumOCamlVersion = "4.07"; + meta.description = "S-expression pretty-printer"; + propagatedBuildInputs = [ ppx_base re sexplib ]; + }; + + sexp_select = janePackage { + pname = "sexp_select"; + hash = "1lchhfqw4afw38fnarwylqc2qp7k6xwx3j7m9gy8ygjgd0vgd729"; + minimumOCamlVersion = "4.07"; + propagatedBuildInputs = [ base ppx_jane ]; + meta.description = "A library to use CSS-style selectors to traverse sexp trees"; + }; + + sexplib0 = janePackage { + pname = "sexplib0"; + hash = "06sb3zqhb3dwqsmn15d769hfgqwqhxnm52iqim9l767gvlwpmibb"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Library containing the definition of S-expressions and some base converters"; + }; + + sexplib = janePackage { + pname = "sexplib"; + hash = "03c3j1ihx4pjbb0x3arrcif3wvp3iva2ivnywhiak4mbbslgsnzr"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Library for serializing OCaml values to and from S-expressions"; + propagatedBuildInputs = [ num parsexp ]; + }; + + shell = janePackage { + pname = "shell"; + hash = "1c4zmpf6s1lk7nficip32c324if6zhm62h9h03d84zgvhvymi0r1"; + meta.description = "Yet another implementation of fork&exec and related functionality"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ textutils ]; + checkInputs = [ ounit ]; + }; + + shexp = janePackage { + pname = "shexp"; + hash = "1h6hsnbg6bk32f8iv6kd6im4mv2pjsjpd1mjsfx80p1n9273xack"; + minimumOCamlVersion = "4.07"; + propagatedBuildInputs = [ posixat spawn ]; + meta.description = "Process library and s-expression based shell"; + }; + + spawn = janePackage { + pname = "spawn"; + version = "0.13.0"; + minimumOCamlVersion = "4.02.3"; + hash = "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf"; + meta.description = "Spawning sub-processes"; + buildInputs = [ ppx_expect ]; + doCheck = false; # tests are broken on NixOS (absolute paths) + }; + + splay_tree = janePackage { + pname = "splay_tree"; + hash = "1xbzzbqb054hl1v1zcgfwdgzqihni3a0dmvrric9xggmgn4ycmqq"; + meta.description = "A splay tree implementation"; + propagatedBuildInputs = [ core_kernel ]; + }; + + splittable_random = janePackage { + pname = "splittable_random"; + hash = "0ax988b1wc7km8khg4s6iphbz16y1rssh7baigxfyw3ldp0agk14"; + meta.description = "PRNG that can be split into independent streams"; + propagatedBuildInputs = [ base ppx_assert ppx_bench ppx_sexp_message ]; + }; + + stdio = janePackage { + pname = "stdio"; + hash = "0vv6d8absy4hvjd1babv7avpsdlvjpnd5hq691h39d0h3pvs6l98"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Standard IO library for OCaml"; + propagatedBuildInputs = [ base ]; + }; + + textutils = janePackage { + pname = "textutils"; + hash = "1ggd0530lc5dkc419y3xw1wb52b4b5j3z78991gn5yxf2s50a8d4"; + meta.description = "Text output utilities"; + propagatedBuildInputs = [ core ]; + }; + + time_now = janePackage { + pname = "time_now"; + hash = "1lyq8zdz93hvpi4hpxh88kds30k5ljil8js9clcqyxrldp5n9mw0"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Reports the current time"; + buildInputs = [ jst-config ppx_optcomp ]; + propagatedBuildInputs = [ jane-street-headers base ppx_base ]; + }; + + timezone = janePackage { + pname = "timezone"; + hash = "0zf075k94nk2wxnzpxia7pnm655damwp1b58xf2s9disia1ydxg7"; + meta.description = "Time-zone handling"; + propagatedBuildInputs = [ core_kernel ]; + }; + + topological_sort = janePackage { + pname = "topological_sort"; + hash = "17iz7956zln31p0xnm3jlhj863zi84bcx41jylzf7gk23qsm95m8"; + meta.description = "Topological sort algorithm"; + propagatedBuildInputs = [ ppx_jane stdio ]; + }; + + typerep = janePackage { + pname = "typerep"; + hash = "0wc7h853ka3s3lxxgm61ypidl0lzgc9abdkil6f72anl0c417y90"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Typerep is a library for runtime types"; + propagatedBuildInputs = [ base ]; + }; + + variantslib = janePackage { + pname = "variantslib"; + hash = "0vy0hpiaawmydh08nqlwjx52pasp74383yi0pshwbdxin99n9mxd"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Part of Jane Street's Core library"; + propagatedBuildInputs = [ base ]; + }; + + vcaml = janePackage { + pname = "vcaml"; + hash = "0ykwrn8bvwx26ad4wb36jw9xnlwsdpnnx88396laxvcfimrp13qs"; + meta.description = "OCaml bindings for the Neovim API"; + propagatedBuildInputs = [ angstrom-async async_extra faraday ]; + }; + + virtual_dom = janePackage { + pname = "virtual_dom"; + hash = "0vcydxx0jhbd5hbriahgp947mc7n3xymyrsfny1c4adk6aaq3c5w"; + meta.description = "OCaml bindings for the virtual-dom library"; + buildInputs = [ js_of_ocaml-ppx ]; + propagatedBuildInputs = [ core_kernel js_of_ocaml lambdasoup tyxml ]; + }; + + zarith_stubs_js = janePackage { + pname = "zarith_stubs_js"; + hash = "16p4bn5spkrx31fr4np945v9mwdq55706v3wl19s5fy6x83gvb86"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Javascripts stubs for the Zarith library"; + doCheck = false; # requires workspace with zarith + }; + + zstandard = janePackage { + pname = "zstandard"; + hash = "1vf76v5m9wsh5f77w9z4i8sxm05wr5digyi95x4wvzdi7q3qg6m8"; + meta.description = "OCaml bindings to Zstandard"; + buildInputs = [ ppx_jane ]; + propagatedBuildInputs = [ core ctypes zstd ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_13.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix index b92bcead95c3e..9675c8d019a02 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_13.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix @@ -1,11 +1,17 @@ -{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.13.0" }: +{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.14.0" }: -{ pname, version ? defaultVersion, hash, ...}@args: +{ pname +, version ? defaultVersion +, hash +, minimumOCamlVersion ? "4.08" +, doCheck ? true +, ...}@args: buildDunePackage (args // { + useDune2 = true; inherit version; - minimumOCamlVersion = "4.08"; + inherit minimumOCamlVersion; src = fetchFromGitHub { owner = "janestreet"; @@ -14,6 +20,8 @@ buildDunePackage (args // { sha256 = hash; }; + inherit doCheck; + meta.license = lib.licenses.mit; meta.homepage = "https://github.com/janestreet/${pname}"; }) diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix index 0db0164589cf2..0391498c37aee 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -2,6 +2,8 @@ , stdlib-shims , ppx_yojson_conv_lib , ocaml-syntax-shims +, yojson +, result , omd , octavius , dune-build-info @@ -12,10 +14,10 @@ , lib }: let - version = "1.1.0"; + version = "1.4.0"; src = fetchzip { - url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/ocaml-lsp-server-${version}.tbz"; - sha256 = "0al89waw43jl80k9z06kh44byhjhwb5hmzx07sddwi1kr1vc6jrb"; + url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/jsonrpc-${version}.tbz"; + sha256 = "16vvwq3d9xmr91r6yv5i2gyqcdliji7asyq4g6iygi617233fa33"; }; # unvendor some (not all) dependencies. @@ -23,7 +25,7 @@ let # ocaml-lsp without messing with your opam switch, but nix should prevent # this type of problems without resorting to vendoring. preBuild = '' - rm -r vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner} + rm -r ocaml-lsp-server/vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner} ''; buildInputs = [ @@ -36,6 +38,7 @@ let dune-build-info omd cmdliner + jsonrpc ]; lsp = buildDunePackage { @@ -47,6 +50,15 @@ let inherit buildInputs preBuild; }; + jsonrpc = buildDunePackage { + pname = "jsonrpc"; + inherit version src; + useDune2 = true; + minimumOCamlVersion = "4.06"; + + buildInputs = [ yojson stdlib-shims ocaml-syntax-shims ppx_yojson_conv_lib result ]; + }; + in buildDunePackage { pname = "ocaml-lsp-server"; diff --git a/pkgs/development/ocaml-modules/ocaml-r/default.nix b/pkgs/development/ocaml-modules/ocaml-r/default.nix index 71e77b24ce4be..d76a98fc05c9d 100644 --- a/pkgs/development/ocaml-modules/ocaml-r/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-r/default.nix @@ -1,14 +1,20 @@ -{ lib, fetchFromGitHub, buildDunePackage, pkg-config, configurator, stdio, R }: +{ lib, fetchFromGitHub, buildDunePackage, pkg-config, dune-configurator, stdio, R +, alcotest +}: buildDunePackage rec { pname = "ocaml-r"; - version = "0.2.0"; + version = "0.4.0"; + + useDune2 = true; + + minimumOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "pveber"; repo = pname; rev = "v${version}"; - sha256 = "09gljccwjsw9693m1hm9hcyvgp3p2fvg3cfn18yyidpc2f81a4fy"; + sha256 = "10is2s148kfh3g0pwniyzp5mh48k57ldvn8gm86469zvgxyij1ri"; }; # Without the following patch, stub generation fails with: @@ -17,9 +23,14 @@ buildDunePackage rec { substituteInPlace stubgen/stubgen.ml --replace \ 'failwithf "not supported: %s" name ()' \ 'sprintf "(* not supported: %s *)" name' + substituteInPlace lib/config/discover.ml --replace \ + ' libRmath"' '"' ''; - buildInputs = [ configurator pkg-config R stdio ]; + buildInputs = [ pkg-config R dune-configurator stdio ]; + + doCheck = true; + checkInputs = [ alcotest ]; meta = { description = "OCaml bindings for the R interpreter"; diff --git a/pkgs/development/ocaml-modules/opam-format/default.nix b/pkgs/development/ocaml-modules/opam-format/default.nix index 422729e6d0df7..fdb8ba33d5eb3 100644 --- a/pkgs/development/ocaml-modules/opam-format/default.nix +++ b/pkgs/development/ocaml-modules/opam-format/default.nix @@ -3,6 +3,8 @@ buildDunePackage rec { pname = "opam-format"; + useDune2 = true; + inherit (opam-core) src version; minimumOCamlVersion = "4.02.3"; diff --git a/pkgs/development/ocaml-modules/opam-repository/default.nix b/pkgs/development/ocaml-modules/opam-repository/default.nix index 1801a9e1c865c..1480a7d5915a8 100644 --- a/pkgs/development/ocaml-modules/opam-repository/default.nix +++ b/pkgs/development/ocaml-modules/opam-repository/default.nix @@ -5,6 +5,8 @@ buildDunePackage rec { minimumOCamlVersion = "4.02"; + useDune2 = true; + inherit (opam-format) src version; patches = [ ./download-tool.patch ]; diff --git a/pkgs/development/ocaml-modules/opam-state/default.nix b/pkgs/development/ocaml-modules/opam-state/default.nix index 156976a4a5ad9..d841631dfd07c 100644 --- a/pkgs/development/ocaml-modules/opam-state/default.nix +++ b/pkgs/development/ocaml-modules/opam-state/default.nix @@ -5,6 +5,8 @@ buildDunePackage rec { inherit (opam) src version; + useDune2 = true; + # get rid of check for curl at configure time # opam-state does not call curl at run time configureFlags = [ "--disable-checks" ]; diff --git a/pkgs/development/ocaml-modules/ounit2/default.nix b/pkgs/development/ocaml-modules/ounit2/default.nix index 708c9a6c19e23..52676a1c88d91 100644 --- a/pkgs/development/ocaml-modules/ounit2/default.nix +++ b/pkgs/development/ocaml-modules/ounit2/default.nix @@ -1,18 +1,21 @@ -{ lib, buildDunePackage, fetchurl, stdlib-shims }: +{ lib, ocaml, buildDunePackage, fetchurl, stdlib-shims, ncurses }: buildDunePackage rec { minimumOCamlVersion = "4.04"; pname = "ounit2"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { url = "https://github.com/gildor478/ounit/releases/download/v${version}/ounit-v${version}.tbz"; - sha256 = "1naahh24lbyxmrnzpfz8karniqbf1nknivf96mrvsr6zlx5ad072"; + sha256 = "0i9kiqbf2dp12c4qcvbn4abdpdp6h4g5z54ycsh0q8jpv6jnkh5m"; }; propagatedBuildInputs = [ stdlib-shims ]; + doCheck = true; + checkInputs = lib.optional (lib.versionOlder ocaml.version "4.07") ncurses; + meta = with lib; { homepage = "https://github.com/gildor478/ounit"; description = "A unit test framework for OCaml"; diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index 1873a4e0c583b..27b6ed3f986bb 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -1,23 +1,24 @@ { stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving -, alcotest, biocaml, gnuplot, lacaml, menhir, ocaml-r, owl, printbox }: +, alcotest, angstrom-unix, biocaml, gnuplot, gsl, lacaml, menhir, owl, printbox }: buildDunePackage rec { pname = "phylogenetics"; - version = "unstable-2020-01-25"; + version = "unstable-2020-11-23"; useDune2 = true; src = fetchFromGitHub { owner = "biocaml"; repo = pname; - rev = "752a7d0324709ba919ef43630a270afd45d6b734"; - sha256 = "1zsxpl1yjbw6y6n1q7qk3h0l7c0lxhh8yp8bkxlwnpzlkqq28ycg"; + rev = "e6e10efa0a3a8fd61bf4ab69e91a09549cc1ded6"; + sha256 = "0pmypzp0rvlpzm8zpbcfkphwnhrpyfwfv44kshvx2f8nslmksh8c"; }; minimumOCamlVersion = "4.08"; # e.g., uses Float.min checkInputs = [ alcotest ]; - propagatedBuildInputs = [ biocaml gnuplot lacaml menhir ocaml-r owl ppx_deriving printbox ]; + buildInputs = [ menhir ]; + propagatedBuildInputs = [ angstrom-unix biocaml gnuplot gsl lacaml owl ppx_deriving printbox ]; doCheck = false; # many tests require bppsuite diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index 8821e56212958..d5b09b1ddc210 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -1,24 +1,34 @@ { lib, fetchFromGitHub, buildDunePackage, ocaml -, legacy ? false +, version ? if lib.versionAtLeast ocaml.version "4.07" then "0.15.0" else "0.13.0" , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio +, stdlib-shims }: -let param = - if legacy then { - version = "0.8.1"; +let param = { + "0.8.1" = { sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6"; - } else { - version = "0.12.0"; - sha256 = "1cg0is23c05k1rc94zcdz452p9zn11dpqxm1pnifwx5iygz3w0a1"; - }; in + max_version = "4.10"; + }; + "0.13.0" = { + sha256 = "0c54g22pm6lhfh3f7s5wbah8y48lr5lj3cqsbvgi99bly1b5vqvl"; + }; + "0.15.0" = { + sha256 = "1p037kqj5858xrhh0dps6vbf4fnijla6z9fjz5zigvnqp4i2xkrn"; + min_version = "4.07"; + useDune2 = true; + }; +}."${version}"; in -if lib.versionAtLeast ocaml.version "4.10" && legacy -then throw "ppxlib-${param.version} is not available for OCaml ${ocaml.version}" +if param ? max_version && lib.versionAtLeast ocaml.version param.max_version +|| param ? min_version && !lib.versionAtLeast ocaml.version param.min_version +then throw "ppxlib-${version} is not available for OCaml ${ocaml.version}" else buildDunePackage rec { pname = "ppxlib"; - inherit (param) version; + inherit version; + + useDune2 = param.useDune2 or false; src = fetchFromGitHub { owner = "ocaml-ppx"; @@ -29,6 +39,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ppx_derivers stdio + stdlib-shims ]; meta = { diff --git a/pkgs/development/ocaml-modules/sqlexpr/default.nix b/pkgs/development/ocaml-modules/sqlexpr/default.nix deleted file mode 100644 index df6b6f0854d4c..0000000000000 --- a/pkgs/development/ocaml-modules/sqlexpr/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, buildDunePackage, ocaml_lwt -, lwt_ppx, ocaml-migrate-parsetree, ppx_tools_versioned, csv, ocaml_sqlite3 -}: - -buildDunePackage rec { - pname = "sqlexpr"; - version = "0.9.0"; - - src = fetchurl { - url = "https://github.com/mfp/ocaml-sqlexpr/releases/download/${version}/ocaml-sqlexpr-${version}.tar.gz"; - sha256 = "0z0bkzi1mh0m39alzr2ds7hjpfxffx6azpfsj2wpaxrg64ks8ypd"; - }; - - buildInputs = [ lwt_ppx ocaml-migrate-parsetree ppx_tools_versioned ]; - propagatedBuildInputs = [ ocaml_lwt csv ocaml_sqlite3 ]; - doCheck = true; - - preBuild = "rm META.sqlexpr"; - - meta = { - description = "Type-safe, convenient SQLite database access"; - homepage = "https://github.com/mfp/ocaml-sqlexpr"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - }; -} diff --git a/pkgs/development/ocaml-modules/sqlexpr/ppx.nix b/pkgs/development/ocaml-modules/sqlexpr/ppx.nix deleted file mode 100644 index 572ff5936154c..0000000000000 --- a/pkgs/development/ocaml-modules/sqlexpr/ppx.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ buildDunePackage, sqlexpr, ounit -, ppxlib, ppx_tools_versioned, re, lwt_ppx -}: - -buildDunePackage { - pname = "ppx_sqlexpr"; - inherit (sqlexpr) version src meta; - - minimumOCamlVersion = "4.06"; - - postPatch = '' - substituteInPlace src/ppx/jbuild --replace ppx_core ppxlib - ''; - - buildInputs = [ sqlexpr ounit ppxlib ppx_tools_versioned re lwt_ppx ]; - doCheck = true; -} diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix index 504e15ae16dc1..8f9eed0c1c30e 100644 --- a/pkgs/development/php-packages/imagick/default.nix +++ b/pkgs/development/php-packages/imagick/default.nix @@ -12,9 +12,14 @@ buildPecl { url = "https://github.com/Imagick/imagick/pull/336.patch"; sha256 = "nuRdh02qaMx0s/5OzlfWjyYgZG1zgrYnAjsZ/UVIrUM="; }) + # Fix detection of ImageMagick 7. + (fetchpatch { + url = "https://github.com/Imagick/imagick/commit/09551fbf38c16cdaf4ade7c08744501cd82d2747.patch"; + sha256 = "qUeQHP08kKOzuQdEpR8RSZ18Yhi0U9z24KwQcAx1UVg="; + }) ]; - configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; + configureFlags = [ "--with-imagick=${pkgs.imagemagick7.dev}" ]; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pcre' ]; diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index 11ac2b7599b2a..1a58562ab06d2 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "JPype1"; - version = "1.1.2"; + version = "1.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c6e36de9f7ef826ff27f6d5260acc710ebc585a534c12cbac905db088ab1d992"; + sha256 = "62ca03e7f7963ba4ac1065ee48ff661f752b3db3c23549ed8933ab40196a3157"; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix index e9156b5c6af1e..e63a26e5f74f1 100644 --- a/pkgs/development/python-modules/acme/default.nix +++ b/pkgs/development/python-modules/acme/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage , certbot -, pytest , cryptography , pyasn1 , pyopenssl @@ -25,7 +24,9 @@ buildPythonPackage rec { werkzeug mock ndg-httpsclient josepy ]; - checkInputs = [ pytest ]; + # does not contain any tests + doCheck = false; + pythonImportsCheck = [ "acme" ]; sourceRoot = "source/${pname}"; diff --git a/pkgs/development/python-modules/aiomysql/default.nix b/pkgs/development/python-modules/aiomysql/default.nix index 4de8eaba3d8f1..803f642406c81 100644 --- a/pkgs/development/python-modules/aiomysql/default.nix +++ b/pkgs/development/python-modules/aiomysql/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "PyMySQL>=0.9,<=0.9.2" "PyMySQL" + --replace "PyMySQL>=0.9,<=0.9.3" "PyMySQL" ''; checkPhase = '' diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix index 76775acb1632a..df115cf7c4709 100644 --- a/pkgs/development/python-modules/ansi2html/default.nix +++ b/pkgs/development/python-modules/ansi2html/default.nix @@ -4,6 +4,8 @@ buildPythonPackage rec { pname = "ansi2html"; version = "1.6.0"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596"; @@ -22,6 +24,5 @@ buildPythonPackage rec { homepage = "https://github.com/ralphbean/ansi2html"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ davidtwco ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 44b769636ca57..dc990325bfe69 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.4.2"; + version = "2.5.0"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "1c4a697d05a5e3d8d16ea18526115e84d8f015ba4c8b721a0d84062b6b244ef4"; + sha256 = "0b65e2af73a2e39a271bd627abbe4f7e4b0345486ed403e65987d79c72fcb70b"; }; patches = [ diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 2af445b48c530..79844afe318e0 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "3.13.0"; + version = "3.14.0"; src = fetchPypi { inherit pname version; - sha256 = "2e968d01364c8c94fbe85154ab77ebe9e51a3f8282405bb33748071452063004"; + sha256 = "ac7808d00676c5e7ffa9eaa228807ca1f8db7a0f4dc115337c80fb6d7eb2b50a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 6a919c768c700..9b9ca52b947b0 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -1,34 +1,35 @@ { lib , buildPythonPackage , fetchPypi +, cmake +, numba , numpy -, pandas -, pytestrunner -, pytest -, h5py +, pytestCheckHook +, rapidjson }: buildPythonPackage rec { pname = "awkward"; - version = "0.14.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "6a3878f46e8bc2acf28a0b9feb69d354ad2fee2a2a0f65c48c115aa74f245204"; + sha256 = "d856b4a166ae054363368aed2e4a44338fec069baa4242e7d567c8323ebcc1eb"; }; - nativeBuildInputs = [ pytestrunner ]; - checkInputs = [ pandas pytest h5py ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ rapidjson ]; propagatedBuildInputs = [ numpy ]; - checkPhase = '' - py.test - ''; + dontUseCmakeConfigure = true; + + checkInputs = [ pytestCheckHook numba ]; + dontUseSetuptoolsCheck = true; meta = with lib; { - description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy"; - homepage = "https://github.com/scikit-hep/awkward-array"; + description = "Manipulate JSON-like data with NumPy-like idioms"; + homepage = "https://github.com/scikit-hep/awkward-1.0"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/python-modules/awkward0/default.nix b/pkgs/development/python-modules/awkward0/default.nix new file mode 100644 index 0000000000000..4441d131e637e --- /dev/null +++ b/pkgs/development/python-modules/awkward0/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pandas +, pytestrunner +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "awkward0"; + version = "0.15.1"; + + src = fetchFromGitHub { + owner = "scikit-hep"; + repo = "awkward-0.x"; + rev = version; + sha256 = "17zrw25h6g5m4ik1c5piqb7q2bxrshfm4hm3lzfz4s8gi0xjm5gz"; + }; + + nativeBuildInputs = [ pytestrunner ]; + + propagatedBuildInputs = [ numpy ]; + + checkInputs = [ pandas pytestCheckHook ]; + + checkPhase = '' + # Almost all tests in this file fail + rm tests/test_persist.py + py.test + ''; + + meta = with lib; { + description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy"; + homepage = "https://github.com/scikit-hep/awkward-array"; + license = licenses.bsd3; + maintainers = with maintainers; [ costrouc SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/awkward1/default.nix b/pkgs/development/python-modules/awkward1/default.nix deleted file mode 100644 index dae8a235d80f3..0000000000000 --- a/pkgs/development/python-modules/awkward1/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, cmake -, numba -, numpy -, pytestCheckHook -, rapidjson -}: - -buildPythonPackage rec { - pname = "awkward1"; - version = "0.4.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "8c786d1641343e9887c21794f9a3bf51716b00ed3b182491f1acbc9e389b31bb"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ rapidjson ]; - propagatedBuildInputs = [ numpy ]; - - dontUseCmakeConfigure = true; - - checkInputs = [ pytestCheckHook numba ]; - dontUseSetuptoolsCheck = true; - - meta = with lib; { - description = "Manipulate JSON-like data with NumPy-like idioms"; - homepage = "https://github.com/scikit-hep/awkward-1.0"; - license = licenses.bsd3; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index 08b9e73e66d24..08915244fc4be 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "2.0.0"; + version = "2.1.0"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "fd47029f2423e45ec4d311f651dc972043b98e960f186f5c6508c6fdf6eb2fe8"; + sha256 = "ed55df52d35fc03a9c7ca060af1ec0faf7b5510381d2a5e74b73f59ac0d79028"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix index 2135853ff9de1..22b6281fa7695 100644 --- a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-mgmt-synapse"; - version = "0.5.0"; + version = "0.6.0"; disabled = pythonOlder "3"; src = fetchPypi { inherit pname version; - sha256 = "4eb76230c38525b71eb1addefebd265bc3d9b68ba7ff60ce5356d39f68ed2837"; + sha256 = "f81cb52b220774aab93ffcf25bdc17e03fd84b6916836640789f86fbf636b984"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix index a55eeff511fe9..b85c642787e62 100644 --- a/pkgs/development/python-modules/backports_unittest-mock/default.nix +++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix @@ -13,9 +13,14 @@ buildPythonPackage rec { buildInputs = [ setuptools_scm ]; + # does not contain tests + doCheck = false; + pythonImportsCheck = [ "backports.unittest_mock" ]; + meta = with stdenv.lib; { description = "Provides a function install() which makes the mock module"; homepage = "https://github.com/jaraco/backports.unittest_mock"; license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index b139a88820e66..22807bb35351b 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.5.7"; + version = "1.5.8"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "624fade609636c64e7829ff072bdf12f93512948a803059b059e5c90df894be2"; + sha256 = "5b8c3b9047d2e00e25746d55f56f62071f0a82dd2de59371a1ee589fe28b2852"; }; # needs packages which are not available in nixpkgs diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 09ba8f7b5f527..91d94fcd72d9f 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.9.1"; + version = "0.10.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f81b0069e5c1570883144c1910b884e5cefe16d3c2ed09e579b6d8f853f08588"; + sha256 = "5c3a873965f2910865895e572e7a4f10533d6e150e6ba17936397426bf8d1eee"; }; postPatch = '' diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 1667c49e17646..29445c6d795b5 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.16.35"; # N.B: if you change this, change botocore too + version = "1.16.43"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "0ah1jhj68v6d8qm2mk64jjl6zi9qa3ssmj9jv3fmk9kyahahjpm3"; + sha256 = "sha256-pJs6tL+i9jlLpgFlz8RoQQeX3UEPMu7UfiL2FFHumG4="; }; 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 e0ecc77c30630..e687718aa4c21 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.19.35"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.19.43"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "08vymgdv3d0394gqgmbzqk00248zhkigfc21vwbhf1lva08ajfk3"; + sha256 = "sha256-c5jJANvU49YWRyaSFTluo+gIL0lPPntl2basoEnB1GM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 729b9f9f24a58..e283c9ee6bed6 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.24.1"; + version = "4.25.1"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d8e47ba4b975f3228a13daf481762f784f87d1e6e87a01619360d59e558d2fc0"; + sha256 = "bf81658ed31f8f586247d203923479fcde6c3797d376c804bdafa7e56ffd43b5"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index 37c91127a2c8a..25de097f1a964 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "bugwarrior"; - version = "1.7.0"; + version = "1.8.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1pmznka5dxcdjfak0p1yh7lhfbfazmx8g9ysv57lsrkqy4n61qks"; + sha256 = "f024c29d2089b826f05481cace33a62aa984f33e98d226f6e41897e6f11b3f51"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 37ddae150363a..e2938e0f32e26 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "bumps"; - version = "0.7.18"; + version = "0.8.0"; propagatedBuildInputs = [six]; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "3217d4fd3ec767448d742f3b6ff527cc3817f2421b9a9a8456e1d8ee4a9b1087"; + sha256 = "9f92c05effd8175763799d19ca55592e89b053318f611148a6725159aea41d67"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index ca902abea0862..6633657d18637 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.12.0"; + version = "0.15.0"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "0rik4167b5d8x035vmbw52qm6ghyb38z4ri7wfb43dnab6df0r9b"; + sha256 = "0w34xs9qpf1x4rq2ri4fhx3yi8h4inzavv9hjsx8mlkzid7gdx1b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 42018661f7415..224ff33d5f05a 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.21.6"; + version = "1.21.7"; src = fetchPypi { inherit pname version; - sha256 = "b7a17583e0553caa0e44d23186b4aad069f7665c24a473104d1f04e62cc4cb07"; + sha256 = "22512bccb9b881b8d5a33bd45c7ad539dee60f2f8685a5ed8afd5000a962b0f8"; }; checkInputs = [ watchdog pytest hypothesis mock ]; diff --git a/pkgs/development/python-modules/ciscomobilityexpress/default.nix b/pkgs/development/python-modules/ciscomobilityexpress/default.nix new file mode 100644 index 0000000000000..86a2bd8aa88ea --- /dev/null +++ b/pkgs/development/python-modules/ciscomobilityexpress/default.nix @@ -0,0 +1,20 @@ +{ buildPythonPackage, fetchPypi, lib, requests }: + +buildPythonPackage rec { + pname = "ciscomobilityexpress"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "fd3fe893d8a44f5ac1d46580af88e07f1066e73744763aca4ef2226f87d575ff"; + }; + + propagatedBuildInputs = [ requests ]; + + meta = { + description = "Module to interact with Cisco Mobility Express APIs to fetch connected devices"; + homepage = "https://pypi.python.org/pypi/${pname}/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ uvnikita ]; + }; +} diff --git a/pkgs/development/python-modules/clickhouse-driver/default.nix b/pkgs/development/python-modules/clickhouse-driver/default.nix index 9cb88b5cbc9b5..a1addcfc97ab8 100644 --- a/pkgs/development/python-modules/clickhouse-driver/default.nix +++ b/pkgs/development/python-modules/clickhouse-driver/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "clickhouse-driver"; - version = "0.1.5"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1827cm5z2zd6mxn9alq54bbzw6vhz4a30a54vacqn7nz691qs1gd"; + sha256 = "62d37f93872d5a13eb6b0d52bab2b593ed0e14cf9200949aa2d02f9801064c0f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 41802f0d06512..0bee19c3f4f3c 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "cryptography"; - version = "3.2.1"; # Also update the hash in vectors.nix + version = "3.3.1"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "1qxz02kfsrihq1h4afyqwcsv9nh3s9mmrr6y9lhi4angw05y3mfk"; + sha256 = "1ribd1vxq9wwz564mg60dzcy699gng54admihjjkgs9dx95pw5vy"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 567ce23783ead..94526c8268ef5 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "12dq1grn0bjj7c6sj6apd6328525n7xq4kbbmww63sn3x7081vls"; + sha256 = "192wix3sr678x21brav5hgc6j93l7ab1kh69p2scr3fsblq9qy03"; }; # No tests included diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 4b0d46918097a..ee2c9ded18df0 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "cypari2"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.1.2"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "03cd45edab8716ebbfdb754e65fea72e873c73dc91aec098fe4a01e35324ac7a"; + sha256 = "df1ef62e771ec36e5a456f5fc8b51bc6745b70f0efdd0c7a30c3f0b5f1fb93db"; }; # This differs slightly from the default python installPhase in that it pip-installs @@ -26,7 +26,7 @@ buildPythonPackage rec { export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" # install "." instead of "*.whl" - ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install --no-index --prefix=$out --no-cache --build=tmpdir . + ${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install . --no-index --no-warn-script-location --prefix="$out" --no-cache ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index 80fa1c35d6324..cbd80333b2f08 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { pname = "daphne"; - version = "2.5.0"; + version = "3.0.1"; disabled = !isPy3k; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "0qkhmblj3a5s3z65cgz46xsvq1b6x4m3kr6aljjnxnv7hcwib02n"; + sha256 = "1bkxhzvaqwz760c11nhaiwvsq1d1csmk5dz2a1j1ynypjprhvhsk"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 3ae2142181641..2e0039b23179b 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -14,6 +14,7 @@ , python-baseconv , pyyaml , uvicorn +, httpx # Check Inputs , pytestCheckHook , pytestrunner @@ -26,13 +27,13 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.46"; + version = "0.53"; src = fetchFromGitHub { owner = "simonw"; repo = "datasette"; rev = version; - sha256 = "0g4dfq5ykifa9628cb4i7gvx98p8hvb99gzfxk3bkvq1v9p4kcqq"; + sha256 = "1rsgxkvav1qy2ia2csm1jvabd8klh3ly8719979gdlx2il1cjjkz"; }; nativeBuildInputs = [ pytestrunner ]; @@ -52,6 +53,8 @@ buildPythonPackage rec { pyyaml uvicorn setuptools + httpx + asgiref ]; checkInputs = [ @@ -59,7 +62,6 @@ buildPythonPackage rec { pytest-asyncio aiohttp beautifulsoup4 - asgiref ]; postConfigure = '' @@ -75,9 +77,9 @@ buildPythonPackage rec { # takes 30-180 mins to run entire test suite, not worth the cpu resources, slows down reviews # with pytest-xdist, it still takes around 10mins with 32 cores - # just run the messages tests, as this should give some indictation of correctness + # just run the csv tests, as this should give some indictation of correctness pytestFlagsArray = [ - "tests/test_messages.py" + "tests/test_csv.py" ]; disabledTests = [ "facet" diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index e2a4625c60e4f..4f784642537f3 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -23,8 +23,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp websockets ]; patchPhase = '' substituteInPlace "requirements.txt" \ - --replace "aiohttp>=3.6.0,<3.7.0" "aiohttp~=3.6.0" \ - --replace "websockets>=6.0,!=7.0,!=8.0,!=8.0.1,<9.0" "websockets>=6" + --replace "aiohttp>=3.6.0,<3.7.0" "aiohttp" \ + --replace "websockets>=6.0,!=7.0,!=8.0,!=8.0.1,<9.0" "websockets" '' + lib.optionalString withVoice '' substituteInPlace "discord/opus.py" \ --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'" diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index 6dc4ad3402bc5..313ae32f04e31 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "3.5.0"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "db82b2840f667d47872ae3e4a4e0a0d72fbecb42779b8aa233fa8bb965f7836a"; + sha256 = "5665fc1b1aabf1b678885cf6f8f8bd7da36ef0a978375e767d491b48d3055d8f"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index c0467bbba7053..bdf7c21514c26 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-storages"; - version = "1.10.1"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "652275ab7844538c462b62810276c0244866f345878256a9e0e86f5b1283ae18"; + sha256 = "c823dbf56c9e35b0999a13d7e05062b837bae36c518a40255d522fbe3750fbb4"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix index 303d6d95a460e..3f5371e397afc 100644 --- a/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -2,19 +2,18 @@ , buildPythonPackage , fetchPypi , django -, six }: buildPythonPackage rec { pname = "django-contrib-comments"; - version = "1.9.2"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d1232bade3094de07dcc205fc833204384e71ba9d30caadcb5bb2882ce8e8d31"; + sha256 = "26350b2c353816570a74b7fb19c558ce00288625ac32886a5274f4f931c098f9"; }; - propagatedBuildInputs = [ django six ]; + propagatedBuildInputs = [ django ]; meta = with stdenv.lib; { homepage = "https://github.com/django/django-contrib-comments"; diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 9b32bab7d6be4..0fa202addb922 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.18.200"; + version = "2.19.202"; # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "340848e67e1389b32b44d16a100aed1ebb0a6f0519b0f3cbce7cd0de6478fd6c"; + sha256 = "2b606dc645f99feae67dfc528620dddc773ecef5d59bcaeae68bba601f25162b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-testing/default.nix b/pkgs/development/python-modules/flask-testing/default.nix index feb3766067bf9..24e2e6343a20e 100644 --- a/pkgs/development/python-modules/flask-testing/default.nix +++ b/pkgs/development/python-modules/flask-testing/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-Testing"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "1rkkqgmrzmhpv6y1xysqh0ij03xniic8h631yvghksqwxd9vyjfq"; + sha256 = "0a734d7b68e63a9410b413cd7b1f96456f9a858bd09a6222d465650cc782eb01"; }; postPatch = '' diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index 43fdae8ccafcc..c694c15f5573a 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -1,19 +1,21 @@ { lib, buildPythonPackage, fetchPypi, python , fonttools, lxml, fs, unicodedata2 , defcon, fontpens, fontmath, booleanoperations -, pytest +, pytest, setuptools_scm }: buildPythonPackage rec { pname = "fontParts"; - version = "0.9.6"; + version = "0.9.7"; src = fetchPypi { inherit pname version; - sha256 = "0q8ilc1ypmasci2x1nq69hnfsnvbi1czaxgsb3zgqd8777bn5v9z"; + sha256 = "183y1y11bqd4ky4anyv40qbvsm6i90gnydqzrjg7syspjsqvfqgy"; extension = "zip"; }; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ booleanoperations fonttools diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index a1433d08bd04d..cd91eb08be0ee 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -12,6 +12,7 @@ , sympy , matplotlib , reportlab +, sphinx , pytest , pytest-randomly , glibcLocales @@ -19,14 +20,14 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.14.0"; + version = "4.18.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0aiaxjg2v2391gxnhp4nvmgfb3ygm6x7n080s5mnkfjq2bq319in"; + sha256 = "0h750gvwpsp7fpmgfwkx93gkaf0m1s698g6r7n4xlaji563nlkiv"; }; # all dependencies are optional, but @@ -53,6 +54,7 @@ buildPythonPackage rec { matplotlib # pens reportlab + sphinx ]; preCheck = '' diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 7956a31492c0d..20d47dfe7e948 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "1.9.1"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "883a862ddd17b0f4868ec55d6697a64c13d91c41b9fa5103198d2140053abac2"; + sha256 = "b33021b58edacc16bf2ba8453efbb26a8b04242ee3f4d62dcdaa3c6e199f136f"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix index 1f7975abe5c14..cfc481a90afb2 100644 --- a/pkgs/development/python-modules/gmpy2/default.nix +++ b/pkgs/development/python-modules/gmpy2/default.nix @@ -10,7 +10,7 @@ let pname = "gmpy2"; - version = "2.1a4"; + version = "2.1.0b5"; in buildPythonPackage { @@ -22,20 +22,9 @@ buildPythonPackage { owner = "aleaxit"; repo = "gmpy"; rev = "gmpy2-${version}"; - sha256 = "1wg4w4q2l7n26ksrdh4rwqmifgfm32n7x29cgdvmmbv5lmilb5hz"; + sha256 = "1mqzyp7qwqqyk6jbicgx22svdy2106xwhmhfvdf0vpnmwswcxclb"; }; - patches = [ - # Backport of two bugfixes (including a segfault): - # https://github.com/aleaxit/gmpy/pull/217 - # https://github.com/aleaxit/gmpy/pull/218 - (fetchpatch { - name = "bugfixes.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/gmpy2/patches/PR217_PR218_conversion_methods.patch?id=b7fbb9a4dac5d6882f6b83a57447dd79ecafb84c"; - sha256 = "1x3gwvqac36k4ypclxq37fcvi6p790k4xdpm2bj2b3xsvjb80ycz"; - }) - ]; - buildInputs = [ gmp mpfr libmpc ]; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google_cloud_bigquery/default.nix index cea0608c3f77b..3255475fbf51d 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.4.0"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "2d53d6fed1c25c9c0ce361dad1c64203c96b2344f7156357a501630d1cb08445"; + sha256 = "1f99fd0c0c5bde999e056a1be666e5d5bbf392f62c9e730dfcbaf6e8408d44ef"; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix index a4b310797a7f8..815ecc118f9b8 100644 --- a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix +++ b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "0.30.2"; + version = "0.30.3"; src = fetchPypi { inherit pname version; - sha256 = "de7eba5235df61deee2291a2fe70b904154df613a334109488afdea7a4c0011f"; + sha256 = "3577bbf38f2c7c2f42306b8dfdeffbb0eedf45aaec947fd513d51937f72046d1"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix index 80bdcd1b83cce..d4fb4c59a18c0 100644 --- a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.32.0"; + version = "0.32.1"; src = fetchPypi { inherit pname version; - sha256 = "3d125c01817d5bef2b644095b044d22b03b9d8d4591088cadd8e97851f7a150a"; + sha256 = "57143ec3c5ed3e0bee590a98857eec06c68aa2eacbce477403226a0d2e85a8ad"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index dbc5791ac335c..e4a20bc83d72e 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -1,5 +1,14 @@ -{ stdenv, buildPythonPackage, fetchPypi -, numpy, scipy, six, paramz, nose, matplotlib, cython }: +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +, scipy +, six +, paramz +, matplotlib +, cython +, nose +}: buildPythonPackage rec { pname = "GPy"; @@ -10,21 +19,35 @@ buildPythonPackage rec { sha256 = "04faf0c24eacc4dea60727c50a48a07ddf9b5751a3b73c382105e2a31657c7ed"; }; - # running tests produces "ImportError: cannot import name 'linalg_cython'" - # even though Cython has run - checkPhase = "nosetests -d"; - doCheck = false; - + buildInputs = [ cython ]; + propagatedBuildInputs = [ numpy scipy six paramz matplotlib ]; checkInputs = [ nose ]; - buildInputs = [ cython ]; + # $ nosetests GPy/testing/*.py + # => Ran 483 tests in 112.146s (on 8 cores) + # So instead, run shorter set of tests + checkPhase = '' + nosetests GPy/testing/linalg_test.py + ''; - propagatedBuildInputs = [ numpy scipy six paramz matplotlib ]; + # Rebuild cython-generated .c files since the included + # ones were built with an older version of cython that is + # incompatible with python3.9 + preBuild = '' + for fn in $(find . -name '*.pyx'); do + echo $fn | sed 's/\.\.pyx$/\.c/' | xargs ${cython}/bin/cython -3 + done + ''; + + pythonImportsCheck = [ + "GPy" + ]; meta = with stdenv.lib; { description = "Gaussian process framework in Python"; homepage = "https://sheffieldml.github.io/GPy"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; + broken = stdenv.isDarwin; # See inscrutable error message here: https://github.com/NixOS/nixpkgs/pull/107653#issuecomment-751527547 }; } diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index 909606c25ebf8..3f601eacc4295 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; checkPhase = '' - pytest --doctest-modules --pyargs hmmlearn + pytest --pyargs hmmlearn ''; meta = with lib; { diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index 5b8cb6cecb9f6..cc6003fa952cc 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "howdoi"; - version = "2.0.7"; + version = "2.0.8"; src = fetchPypi { inherit pname version; - sha256 = "09362f7390119dffd83c61a942801ad4d19aee499340ef7e8d5871167391d3d6"; + sha256 = "9b7cabab87cd614e26b408653bc8937ec27b79ca2fde6b9457da55d2541f75fb"; }; postPatch = '' diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 99612882814fa..9944816f8a1cf 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,19 +6,21 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2020.6.9"; + version = "2020.11.21"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "12js2xcj4979jklc19hjmv5p2b6689p18p4w9swhjc6cgcwm4jy2"; + sha256 = "0z2bq51dw1zak13558s2vj7pdnwad402f3ia5j2an0r678rwhsij"; }; # tests require network connection doCheck = false; + pythonImportsCheck = [ "hstspreload" ]; + meta = with lib; { description = "Chromium HSTS Preload list as a Python package and updated daily"; homepage = "https://github.com/sethmlarson/hstspreload"; diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index a3cd4d5ec4d86..9ce859c9b7608 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.10.5"; + version = "0.10.6"; src = fetchPypi { inherit pname version; - sha256 = "87dc2a3183c1d4595990203e752b430155d7582a60850dfe0756189a233d4b57"; + sha256 = "b0561dbdfecc6a6d7b0cc226d75a800ae9bbc93313a6ad526a1adc97be51eada"; }; propagatedBuildInputs = [ requests six ]; diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 141412d5bd338..bc2f39ad2178b 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.12.0"; + version = "1.13.0"; disabled = pythonOlder "3.6"; # requires python version >=3.6 @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "0b4xr8nwrnikj2rnyrrcl6pym2il8iirr9f9cyg6vzfgx8l8brk9"; + sha256 = "0g7jhjnag8jx8zbjh6xlqds42alpj87a4dpqc37xqa4ir55m3c2q"; }; # makes test not reproducible diff --git a/pkgs/development/python-modules/ircstates/default.nix b/pkgs/development/python-modules/ircstates/default.nix index 3e54451eb3625..b5404febfa3c3 100644 --- a/pkgs/development/python-modules/ircstates/default.nix +++ b/pkgs/development/python-modules/ircstates/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "ircstates"; - version = "0.11.6"; + version = "0.11.7"; disabled = pythonOlder "3.6"; # f-strings src = fetchFromGitHub { owner = "jesopo"; repo = pname; rev = "v${version}"; - sha256 = "0yhrd1nmf9fjwknbga8wspy3bab40lgp4qqnr7w75x9wq5ivmqhg"; + sha256 = "00dyd6mry10na98x1gs92xnfpjf1wd9zpblx1wcx8ggv5rqvgqrm"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index d8ab5093ec287..1c6c9a5b9e3c7 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab_git"; - version = "0.23.2"; + version = "0.23.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "2c4c55c5bc651a670b13e89064f7aba7422b72ad6b3f2b3890ac72cc9a2d4089"; + sha256 = "20a4954d8d1b1eb6f9111cd15d6a598bd7ff72b08797cf5e86c5a55827c85a1d"; }; propagatedBuildInputs = [ notebook nbdime git ]; diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index f43c7618b13c3..82391d3775030 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "keepkey"; - version = "6.0.3"; + version = "6.6.0"; src = fetchFromGitHub { owner = "keepkey"; repo = "python-keepkey"; rev = "v${version}"; - sha256 = "0jnkh1nin1lwnx32ak6sv8gzmpnkvcy6vm23wzm1ymzfndxk6rnm"; + sha256 = "1v0ns26ykskn0dpbvz9g6lz4q740qmahvddj3pc3rfbjvg43p3vh"; }; propagatedBuildInputs = [ protobuf hidapi trezor ]; diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index e9bcd0ed895e1..eae2e4208d1de 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "lightgbm"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0d0abcb1035a7f50226412a78993d61830621e16fd6fa685bbf178c97b0d6e82"; + sha256 = "babece2e3613e97748a67ed45387bb0e984bdb1f4126e39f010fbfe7503c7b20"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/macropy/default.nix b/pkgs/development/python-modules/macropy/default.nix index 9048166773ec3..9345573e9a24c 100644 --- a/pkgs/development/python-modules/macropy/default.nix +++ b/pkgs/development/python-modules/macropy/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , python , isPy27 +, pythonAtLeast , pinqSupport ? false, sqlalchemy , pyxlSupport ? false, pyxl3 }: @@ -34,5 +35,6 @@ buildPythonPackage rec { description = "Macros in Python: quasiquotes, case classes, LINQ and more"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; + broken = pythonAtLeast "3.8"; # see https://github.com/lihaoyi/macropy/issues/103 }; } diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix index 95ee5c5001ada..3573c7987c59f 100644 --- a/pkgs/development/python-modules/mpd2/default.nix +++ b/pkgs/development/python-modules/mpd2/default.nix @@ -1,17 +1,19 @@ { stdenv , buildPythonPackage , fetchPypi +, pythonOlder , python , mock }: buildPythonPackage rec { pname = "python-mpd2"; - version = "1.0.0"; + version = "3.0.1"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - extension = "tar.bz2"; sha256 = "772fa6861273bb9f363a97987c2c45ca3965eb770570f1f02566efec9c89fc5f"; }; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 2e751c6f48dc4..85ceaf304c27b 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -1,16 +1,22 @@ -{ stdenv, fetchPypi, buildPythonPackage, typed-ast, psutil, isPy3k +{ stdenv, fetchFromGitHub, buildPythonPackage, typed-ast, psutil, isPy3k , mypy-extensions , typing-extensions +, fetchpatch }: - buildPythonPackage rec { pname = "mypy"; version = "0.790"; disabled = !isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-KyG6Ra2e8uLriM5K6t0BEtD1AmQYMkF2/UlKaCS3SXU="; + # Fetch 0.790 from GitHub temporarily because mypyc.analysis is missing from + # the Pip package (see also https://github.com/python/mypy/issues/9584). It + # should be possible to move back to Pypi for the next release. + src = fetchFromGitHub { + owner = "python"; + repo = pname; + rev = "v${version}"; + sha256 = "0zq3lpdf9hphcklk40wz444h8w3dkhwa12mqba5j9lmg11klnhz7"; + fetchSubmodules = true; }; propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ]; @@ -24,8 +30,31 @@ buildPythonPackage rec { "mypy.api" "mypy.fastparse" "mypy.report" + "mypyc" + "mypyc.analysis" + ]; + + # These three patches are required to make compilation with mypyc work for + # 0.790, see also https://github.com/python/mypy/issues/9584. + patches = [ + (fetchpatch { + url = "https://github.com/python/mypy/commit/f6522ae646a8d87ce10549f29fcf961dc014f154.patch"; + sha256 = "0d3jp4d0b7vdc0prk07grhajsy7x3wcynn2xysnszawiww93bfrh"; + }) + (fetchpatch { + url = "https://github.com/python/mypy/commit/acd603496237a78b109ca9d89991539633cbbb99.patch"; + sha256 = "0ry1rxpz2ws7zzrmq09pra9dlzxb84zhs8kxwf5xii1k1bgmrljr"; + }) + (fetchpatch { + url = "https://github.com/python/mypy/commit/81818b23b5d53f31caf3515d6f0b54e3c018d790.patch"; + sha256 = "002y24kfscywkw4mz9lndsps543j4xhr2kcnfbrqr4i0yxlvdbca"; + }) ]; + # Compile mypy with mypyc, which makes mypy about 4 times faster. The compiled + # version is also the default in the wheels on Pypi that include binaries. + MYPY_USE_MYPYC = "1"; + meta = with stdenv.lib; { description = "Optional static typing for Python"; homepage = "http://www.mypy-lang.org"; diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 432603d620559..33c7d307b0371 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -3,13 +3,13 @@ }: buildPythonPackage rec { pname = "netCDF4"; - version = "1.5.5"; + version = "1.5.5.1"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "910b0c9d1ca7bef9c5796c45e2f5f30b91df70997ac655c51a58073eff2634f9"; + sha256 = "d957e55a667d1fc651ddef22fea10ded0f142b7d9dbbf4d08c0012d32f445abd"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 430d91a60ecc8..63014647880de 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator }: +{ stdenv, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator, nose }: buildPythonPackage rec { pname = "paramz"; @@ -10,6 +10,12 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy scipy six decorator ]; + checkInputs = [ nose ]; + + # Ran 113 tests in 3.082s + checkPhase = '' + nosetests -v paramz/tests + ''; meta = with stdenv.lib; { description = "Parameterization framework for parameterized model creation and handling"; diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index 3b35b67bf091e..122f34edb6041 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pipx"; - version = "0.15.5.1"; + version = "0.15.6.0"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pipxproject"; repo = pname; rev = version; - sha256 = "0lq8dfkq4ji11r4k5csqzyv0757fbxiax6ixn94f9747zrikssf6"; + sha256 = "1yffswayjfkmq86ygisja0mkg55pqj9pdml5nc0z05222sfnvn1a"; }; propagatedBuildInputs = [ userpath argcomplete packaging ]; @@ -40,6 +40,8 @@ buildPythonPackage rec { "internet" "runpip" "upgrade" + "suffix" + "legacy_venv" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix new file mode 100644 index 0000000000000..f5fe7ff96b842 --- /dev/null +++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -0,0 +1,43 @@ +{ buildPythonPackage +, fetchFromGitHub +, fetchPypi +, git +, isPy27 +, lib +, pytestCheckHook +, ruamel_yaml +, toml +}: + +buildPythonPackage rec { + pname = "pre-commit-hooks"; + version = "3.3.0"; + disabled = isPy27; + + # fetchPypi does not provide tests + src = fetchFromGitHub { + owner = "pre-commit"; + repo = pname; + rev = "v${version}"; + sha256 = "1sppwcqsbr9gv2cpjslngcbggsxvdr84zgrin94yjr40jgkjzdpq"; + }; + + propagatedBuildInputs = [ toml ruamel_yaml ]; + checkInputs = [ git pytestCheckHook ]; + + # the tests require a functional git installation which requires a valid HOME + # directory. + preCheck = '' + export HOME="$(mktemp -d)" + + git config --global user.name "Nix Builder" + git config --global user.email "nix-builder@nixos.org" + ''; + + meta = with lib; { + description = "Some out-of-the-box hooks for pre-commit"; + homepage = "https://github.com/pre-commit/pre-commit-hooks"; + license = licenses.mit; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 789828b7143fd..55590f8bd0638 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -2,15 +2,7 @@ , python , buildPythonPackage , fetchPypi -, pytest , python-utils -, sphinx -, flake8 -, pytest-flakes -, pytestcov -, pytestcache -, pytestrunner -, freezegun }: buildPythonPackage rec { @@ -23,17 +15,12 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ python-utils ]; - nativeBuildInputs = [ pytestrunner ]; - checkInputs = [ - pytest sphinx flake8 pytest-flakes pytestcov - pytestcache freezegun - ]; - # ignore tests on the nix wrapped setup.py - checkPhase = '' - runHook preCheck - ${python.interpreter} setup.py test - runHook postCheck - ''; + + # depends on unmaintained pytest-pep8 + # https://github.com/WoLpH/python-progressbar/issues/241 + doCheck = false; + + pythonImportsCheck = [ "progressbar" ]; meta = with stdenv.lib; { homepage = "https://progressbar-2.readthedocs.io/en/latest/"; diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index 61828ddff0097..68d151336706a 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -1,12 +1,13 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, fonttools, lxml, fs +, fonttools +, lxml, fs # for fonttools extras , setuptools_scm , pytestCheckHook, pytest_5, pytestcov, pytest_xdist }: buildPythonPackage rec { pname = "psautohint"; - version = "2.1.2"; + version = "2.2.0"; disabled = pythonOlder "3.6"; @@ -14,7 +15,7 @@ buildPythonPackage rec { owner = "adobe-type-tools"; repo = pname; rev = "v${version}"; - sha256 = "1s2l54gzn11y07zaggprwif7r3ia244qijjhkbvjdx4jsgc5df8n"; + sha256 = "0gsgfr190xy2rnjf1gf7688xrh13ihgq10s19s4rv5hp6pmg9iaa"; fetchSubmodules = true; # data dir for tests }; diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index 73d367f5eb11a..590fc022d669f 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "PuLP"; - version = "2.3.1"; + version = "2.4"; src = fetchPypi { inherit pname version; - sha256 = "5bbe53f854fb3b689e4faacac5bdb5fa576cb270fc12c78edef827dd46a4fb50"; + sha256 = "b2aff10989b3692e3a59301a0cb0acddeb25dcea378f8804c86007075eae55b5"; }; propagatedBuildInputs = [ pyparsing amply ]; diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index 150198a65aa20..0ec483c16f301 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "py-air-control-exporter"; - version = "0.2.0"; + version = "0.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "2c1bce2423b7452388e35756bef098c123b3cd4a38e8b1302f7297a08e0a9eaa"; + sha256 = "ece2e446273542e5c0352c9d6e80d8279132c6ada3649c59e87a711448801a3b"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index adec3bd07b31c..647866b143fb5 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "17gsamn4aibsx4w50r9dwr5kr9anc7dd0f0dvmdl717rkgh13zyi"; + sha256 = "06qj6r9kcal2nimg8rpjfid8rnlz43l7hn0v9v1mpayjmv2fl8sp"; }; nativeBuildInputs = [ pytestrunner]; diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index aaf703f53949f..554a6ab0b02d4 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "3.0.7"; + version = "3.0.8"; src = fetchPypi { inherit pname version; - sha256 = "47e55d2b0c565a968406f314faad7c002be6d8b0afc8ad2c437d07b7b7d2f590"; + sha256 = "623061d305bd5513a911abb2cbd0e37670be166a270123b43ca757bf78e4b438"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 371bfba2f0f9e..9bf4bede1faf0 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , ujson , email_validator , typing-extensions @@ -9,28 +8,21 @@ , isPy3k , pytest , pytestcov +, pytest-mock }: buildPythonPackage rec { pname = "pydantic"; - version = "1.5.1"; + version = "1.7.3"; disabled = !isPy3k; src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; rev = "v${version}"; - sha256 = "0fwrx7p6d5vskg9ibganahiz9y9299idvdmzhjw62jy84gn1vrb4"; + sha256 = "xihEDmly0vprmA+VdeCoGXg9PjWRPmBWAwk/9f2DLts="; }; - # fix tests, remove on next version bump - patches = [ - (fetchpatch { - url = "https://github.com/samuelcolvin/pydantic/commit/a5b0e741e585040a0ab8b0be94dd9dc2dd3afcc7.patch"; - sha256 = "0v91ac3dw23rm73370s2ns84vi0xqbfzpvj84zb7xdiicx8fhmf1"; - }) - ]; - propagatedBuildInputs = [ ujson email_validator @@ -40,6 +32,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestcov + pytest-mock ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 673b14bfe4fcb..333312d6aa0b2 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pygame"; - version = "2.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "63b038da116a643046181b02173fd894d87d2f85ecfd6aa7d5ece73c6ef501e9"; + sha256 = "8b1e7b63f47aafcdd8849933b206778747ef1802bd3d526aca45ed77141e4001"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index 6f76ca9850fee..075b607c772ea 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -1,27 +1,21 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -}: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytest-mock }: buildPythonPackage rec { - pname = "pykka"; - version = "2.0.1"; + pname = "Pykka"; + version = "2.0.3"; - src = fetchFromGitHub { - owner = "jodal"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "011rvv3vzj9rpwaq6vfpz9hfwm6gx1jmad4iri6z12g8nnlpydhs"; + src = fetchPypi { + inherit pname version; + sha256 = "4b9d2363365b3455a0204bf163f09bd351d24b938c618c79d975a9510e128e95"; }; - # There are no tests - doCheck = false; + checkInputs = [ pytestCheckHook pytest-mock ]; - meta = with stdenv.lib; { - homepage = "http://www.pykka.org"; + meta = with lib; { + homepage = "https://www.pykka.org/"; description = "A Python implementation of the actor model"; + changelog = "https://github.com/jodal/pykka/blob/v${version}/docs/changes.rst"; + maintainers = [ maintainers.marsam ]; license = licenses.asl20; - maintainers = []; }; - } diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 5b971c48d785d..0c32985cfaae0 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -30,12 +30,12 @@ let in buildPythonPackage rec { pname = "PyQt5"; - version = "5.15.1"; + version = "5.15.2"; format = "other"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "18grs2p698ihjgi8agksv6sajakciywyr29ihslqvl260a2np9yr"; + sha256 = "1z74295i69cha52llsqffzhb5zz7qnbjc64h8qg21l91jgf0harp"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index a343db4f55403..7da3239f3e74c 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , six , pytest_4 , hypothesis_4 @@ -11,6 +12,8 @@ buildPythonPackage rec { pname = "pyrsistent"; version = "0.17.3"; + disabled = isPy27; + src = fetchPypi { inherit pname version; sha256 = "2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e"; diff --git a/pkgs/development/python-modules/pysychonaut/default.nix b/pkgs/development/python-modules/pysychonaut/default.nix new file mode 100644 index 0000000000000..ae05070e76d79 --- /dev/null +++ b/pkgs/development/python-modules/pysychonaut/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi, requests, requests-cache, beautifulsoup4 }: + +buildPythonPackage rec { + pname = "PySychonaut"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wgk445gmi0x7xmd8qvnyxy1ka0n72fr6nrhzdm29q6687dqyi7h"; + }; + + preConfigure = '' + substituteInPlace setup.py --replace "bs4" "beautifulsoup4" + ''; + + propagatedBuildInputs = [ requests requests-cache beautifulsoup4 ]; + + # No tests available + doCheck = false; + pythonImportsCheck = [ "pysychonaut" ]; + + meta = with lib; { + description = "Unofficial python api for Erowid, PsychonautWiki and AskTheCaterpillar"; + homepage = "https://github.com/OpenJarbas/PySychonaut"; + maintainers = [ maintainers.ivar ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/pytest-black/default.nix b/pkgs/development/python-modules/pytest-black/default.nix index 20b2483c9d160..6f23c00baf362 100644 --- a/pkgs/development/python-modules/pytest-black/default.nix +++ b/pkgs/development/python-modules/pytest-black/default.nix @@ -18,6 +18,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ black pytest toml ]; + # does not contain tests + doCheck = false; pythonImportsCheck = [ "pytest_black" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index 2d2a3264e7417..9062284d5dfda 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -17,8 +17,13 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ pytest mypy filelock ]; + # does not contain tests + doCheck = false; + pythonImportsCheck = [ "pytest_mypy" ]; + meta = with lib; { description = "Mypy static type checker plugin for Pytest"; homepage = "https://github.com/dbader/pytest-mypy"; diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix index 923fe14cfacfe..7bf05013f214f 100644 --- a/pkgs/development/python-modules/pytest-trio/default.nix +++ b/pkgs/development/python-modules/pytest-trio/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "pytest-trio"; - version = "0.6.0"; - disabled = pythonOlder "3.5"; + version = "0.7.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-trio"; repo = pname; rev = "v${version}"; - sha256 = "09v2031yxm8ryhq12205ldcck76n3wwqhjjsgfmn6dxfiqb0vbw9"; + sha256 = "0bhh2nknhp14jzsx4zzpqm4qnfaihyi65cjf6kf6qgdhc0ax6nf4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix index f073c408f7098..6a97e6d30a4fd 100644 --- a/pkgs/development/python-modules/pytorch/bin.nix +++ b/pkgs/development/python-modules/pytorch/bin.nix @@ -3,6 +3,7 @@ , fetchurl , isPy37 , isPy38 +, isPy39 , python , nvidia_x11 , addOpenGLRunpath @@ -19,7 +20,7 @@ let platform = if stdenv.isDarwin then "darwin" else "linux"; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "1.7.0"; + version = "1.7.1"; in buildPythonPackage { inherit version; @@ -28,7 +29,7 @@ in buildPythonPackage { format = "wheel"; - disabled = !(isPy37 || isPy38); + disabled = !(isPy37 || isPy38 || isPy39); src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; @@ -45,16 +46,6 @@ in buildPythonPackage { typing-extensions ]; - # PyTorch are broken: the dataclasses wheel is required, but ships with - # Python >= 3.7. Our dataclasses derivation is incompatible with >= 3.7. - # - # https://github.com/pytorch/pytorch/issues/46930 - # - # Should be removed with the next PyTorch version. - pipInstallFlags = [ - "--no-deps" - ]; - postInstall = '' # ONNX conversion rm -rf $out/bin diff --git a/pkgs/development/python-modules/pytorch/binary-hashes.nix b/pkgs/development/python-modules/pytorch/binary-hashes.nix index afdde5057dbd8..a542233e15e8d 100644 --- a/pkgs/development/python-modules/pytorch/binary-hashes.nix +++ b/pkgs/development/python-modules/pytorch/binary-hashes.nix @@ -1,10 +1,14 @@ version: { x86_64-linux-37 = { url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp37-cp37m-linux_x86_64.whl"; - sha256 = "0cvafwzd44d7i2d0y01lyk75lhxffcf6c94cx0wla0cnhcg9mqlf"; + hash = "sha256-XXbCVaQUhMHUGp/1cLnJ82y4XflCiqFaWK4WrHz8LqY="; }; x86_64-linux-38 = { url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp38-cp38-linux_x86_64.whl"; - sha256 = "1vxswkb2gzp87sbb5ycvyvs8aw1szp3v2mwdn4mp47yarlnbx8r6"; + hash = "sha256-3S/GiAyV6DaWDYbvu8f2PTKH8uGJPFHTH5bb/gLw1z4="; + }; + x86_64-linux-39 = { + url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-o3k9zOsSseIoEpDMoSd8XOht39W/BE9lQoWk1pBXrqc="; }; } diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index 11fe52d553a9d..3684fee0d22e7 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.2.3"; + version = "0.2.4"; pname = "pyvcd"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c0fd7321143e821033f59dd41fc6b0350d1533ddccd4c8fc1d1f76e21cd667de"; + sha256 = "071e51a8362908ad5a2a12f078185639b98b20b653a56f01679de169d0fa425d"; }; buildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 5853538610a18..1a01eda244b0d 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyvips"; - version = "2.1.13"; + version = "2.1.14"; src = fetchPypi { inherit pname version; - sha256 = "4f1f6fa19893048bf6b950eb7eb2d4cdfeb8b940a9defaca5d4f79e5acd5085f"; + sha256 = "244e79c625be65237677c79424d4476de6c406805910015d4adbd0186c64a6a2"; }; nativeBuildInputs = [ pytestrunner pkgconfig pkg-config ]; diff --git a/pkgs/development/python-modules/requests-hawk/default.nix b/pkgs/development/python-modules/requests-hawk/default.nix index 9641ee9d12ce8..188e66b5c7a8d 100644 --- a/pkgs/development/python-modules/requests-hawk/default.nix +++ b/pkgs/development/python-modules/requests-hawk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "requests-hawk"; - version = "1.0.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1qcga289yr6qlkmc6fjk0ia6l5cg0galklpdzpslf1y8ky9zb7rl"; + sha256 = "1a5e61cab14627f1b5ba7de0e3fb2b681007ff7b2a49110d504e5cd6d7fd62d6"; }; propagatedBuildInputs = [ mohawk requests ]; diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index 9c7f89585d89a..69b928aad0898 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "runway-python"; - version = "0.6.0"; + version = "0.6.1"; src = fetchPypi { inherit pname version; - sha256 = "695d78f8edeb6a7ca98d8351adb36948d56cceeffe8a84896c9fbfd349fc4cb8"; + sha256 = "66cf1517dd817bf6db3792608920274f964dd0ced8dabecd925b8bc17aa95740"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 9438320c1ad83..b3bf8fce0fca4 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "seaborn"; - version = "0.11.0"; + version = "0.11.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "390f8437b14f5ce845062f2865ad51656464c306d09bb97d7764c6cba1dd607c"; + sha256 = "44e78eaed937c5a87fc7a892c329a7cc091060b67ebd1d0d306b446a74ba01ad"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix index 9c08871339a53..d2b4640549690 100644 --- a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix +++ b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -14,6 +14,9 @@ buildPythonPackage rec { checkInputs = [ pytest ]; + doCheck = false; + pythonImportsCheck = [ "setuptools_scm_git_archive" ]; + meta = with stdenv.lib; { description = "setuptools_scm plugin for git archives"; homepage = "https://github.com/Changaco/setuptools_scm_git_archive"; diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 9b4f7cc92716a..e13127abeb31c 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -22,27 +22,27 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.3.4"; + version = "2.3.5"; src = fetchPypi { inherit pname version; - sha256 = "a5c8805759114aac3a1db1b20f42af1124da5315be903ccb4c472cc8452393fb"; + sha256 = "315278ab60094643baecd866017c7d4cbd966efd2d517ad0e6c888edf7fa5aef"; }; propagatedBuildInputs = [ - blis - catalogue - cymem - jsonschema - murmurhash - numpy - plac - preshed - requests - setuptools - srsly - thinc - wasabi + blis + catalogue + cymem + jsonschema + murmurhash + numpy + plac + preshed + requests + setuptools + srsly + thinc + wasabi ] ++ lib.optional (pythonOlder "3.4") pathlib; checkInputs = [ @@ -56,16 +56,16 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ - --replace "blis>=0.4.0,<0.5.0" "blis>=0.4.0,<1.0" \ + --replace "blis>=0.4.0,<0.8.0" "blis>=0.4.0,<1.0" \ --replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \ --replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \ --replace "srsly>=1.0.2,<1.1.0" "srsly>=1.0.2,<3.0" \ - --replace "thinc==7.4.1" "thinc>=7.4.1,<8" + --replace "thinc>=7.4.1,<7.5.0" "thinc>=7.4.1,<8" ''; pythonImportsCheck = [ "spacy" ]; - passthru.tests = callPackage ./annotation-test {}; + passthru.tests.annotation = callPackage ./annotation-test { }; meta = with lib; { description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; diff --git a/pkgs/development/python-modules/sqlite-fts4/default.nix b/pkgs/development/python-modules/sqlite-fts4/default.nix new file mode 100644 index 0000000000000..4342eb6e206a3 --- /dev/null +++ b/pkgs/development/python-modules/sqlite-fts4/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "sqlite-fts4"; + version = "1.0.1"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "simonw"; + repo = pname; + rev = version; + sha256 = "15r1mijk306fpm61viry5wjhqyxlbqqdk4nfcd901qarx7vqypgy"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Custom Python functions for working with SQLite FTS4"; + homepage = "https://github.com/simonw/sqlite-fts4"; + license = licenses.asl20; + maintainers = with maintainers; [ meatcar ]; + }; + +} diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 6e17fc4f38e2c..79c5cf25e3033 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -1,28 +1,32 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k +, pythonOlder , click , click-default-group +, sqlite-fts4 , tabulate , pytestCheckHook , pytestrunner , black +, hypothesis +, sqlite }: buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.0"; - disabled = !isPy3k; + version = "3.1"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a158265fde85a6757b7f09b568b1f7d6eaf75eaae208be27336f09dc048e5bcf"; + sha256 = "53950eb89f77066d6caf553c52ec01701a8bebbaffa9e0a627df3f229ca8720f"; }; propagatedBuildInputs = [ click click-default-group + sqlite-fts4 tabulate ]; @@ -30,13 +34,19 @@ buildPythonPackage rec { pytestCheckHook pytestrunner black + hypothesis + ]; + + # disabled until upstream updates tests + disabledTests = lib.optionals (lib.versionAtLeast sqlite.version "3.34.0") [ + "test_optimize" ]; meta = with lib; { description = "Python CLI utility and library for manipulating SQLite databases"; homepage = "https://github.com/simonw/sqlite-utils"; license = licenses.asl20; - maintainers = [ maintainers.meatcar ]; + maintainers = with maintainers; [ meatcar ]; }; } diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index 4772c13d9c310..dbf0f26c3a3fe 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, async_generator, rsa, pyaes, pythonOlder }: +{ lib, buildPythonPackage, fetchPypi, openssl, async_generator, rsa, pyaes, pythonOlder }: buildPythonPackage rec { pname = "telethon"; @@ -10,6 +10,11 @@ buildPythonPackage rec { sha256 = "1v1rgr030z8s1ldv5lm1811znyd568c22pmlrzzf3ls972xk514m"; }; + patchPhase = '' + substituteInPlace telethon/crypto/libssl.py --replace \ + "ctypes.util.find_library('ssl')" "'${openssl.out}/lib/libssl.so'" + ''; + propagatedBuildInputs = [ rsa pyaes diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/pkgs/development/python-modules/tlslite-ng/default.nix index 244444a276f59..7c8bb17b8b70c 100644 --- a/pkgs/development/python-modules/tlslite-ng/default.nix +++ b/pkgs/development/python-modules/tlslite-ng/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "tlslite-ng"; - version = "0.7.5"; + version = "0.7.6"; src = fetchPypi { inherit pname version; - sha256 = "1aw7j50byzab0xwp50m5w5c14fzdzwk2law5a5bn6dn3i5fc6fw2"; + sha256 = "6ab56f0e9629ce3d807eb528c9112defa9f2e00af2b2961254e8429ca5c1ff00"; }; buildInputs = [ ecdsa ]; diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index eddd6ac4fd184..f1767862ad326 100644 --- a/pkgs/development/python-modules/toposort/default.nix +++ b/pkgs/development/python-modules/toposort/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "toposort"; - version = "1.5"; + version = "1.6"; src = fetchPypi { inherit pname version; - sha256 = "dba5ae845296e3bf37b042c640870ffebcdeb8cd4df45adaa01d8c5476c557dd"; + sha256 = "a7428f56ef844f5055bb9e9e44b343983773ae6dce0fe5b101e08e27ffbd50ac"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 5df20826dc76d..ba40723e7ddd0 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.54.0"; + version = "4.54.1"; src = fetchPypi { inherit pname version; - sha256 = "5c0d04e06ccc0da1bd3fa5ae4550effcce42fcad947b4a6cafa77bdc9b09ff22"; + sha256 = "1x9chlh3msikddmq8p8p5s5kgqqs48bclxgzz3vb9ygcwjimidiq"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 49fbd953d536b..bd9040668c086 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -7,6 +7,7 @@ , regex , requests , numpy +, pandas , parameterized , protobuf , sacremoses @@ -18,14 +19,14 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.0.1"; + version = "4.1.1"; disabled = isPy39; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "1h53a3n6fdrx3ns1h1ip273hzd9pkm9m1qh41si75csb8mi1dq3d"; + sha256 = "1l1gxdsakjmzsgggypq45pnwm87brhlccjfzafs43460pz0wbd6k"; }; propagatedBuildInputs = [ @@ -41,6 +42,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pandas parameterized pytestCheckHook timeout-decorator diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 940618545e878..251d6c3d94ddc 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.8.18"; + version = "3.8.19"; src = fetchPypi { inherit pname version; - sha256 = "89f9ec5f1abe7e829f7f1cb9a7aa3f3eb768482272beb2c8987e933d9c068110"; + sha256 = "e2ec4fc75bddf46fd494a9c95adc0bf0fe6f667cae242ead99955ad659d6e375"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/ufonormalizer/default.nix b/pkgs/development/python-modules/ufonormalizer/default.nix index 770407736a06a..8118c0f9497f7 100644 --- a/pkgs/development/python-modules/ufonormalizer/default.nix +++ b/pkgs/development/python-modules/ufonormalizer/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "ufonormalizer"; - version = "0.5.0"; + version = "0.5.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1qc3389i2y16n1hjg4dzk821klzjipbh9c9yci70z51pp21mwwh5"; + sha256 = "03k9dndnv3p3ysfq5wq8bnaijvqip61fh79d5gz2zk284vc47mgj"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix deleted file mode 100644 index 3c268ed7ed4f2..0000000000000 --- a/pkgs/development/python-modules/uproot-methods/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, numpy -, awkward -}: - -buildPythonPackage rec { - version = "0.9.1"; - pname = "uproot-methods"; - - src = fetchPypi { - inherit pname version; - sha256 = "accb4392c59a1485ce3ee6d78a6fd163731ade8b9b5208e7bde8fa1767aef097"; - }; - - propagatedBuildInputs = [ numpy awkward ]; - - # No tests on PyPi - doCheck = false; - - meta = with stdenv.lib; { - homepage = "https://github.com/scikit-hep/uproot-methods"; - description = "Pythonic mix-ins for ROOT classes"; - license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix deleted file mode 100644 index eadd6c36de1ac..0000000000000 --- a/pkgs/development/python-modules/uproot/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, fetchPypi, buildPythonPackage, isPy27 -, awkward -, backports_lzma -, cachetools -, lz4 -, pandas -, pytestrunner -, pytest -, pkgconfig -, mock -, numpy -, requests -, uproot-methods -, xxhash -}: - -buildPythonPackage rec { - pname = "uproot"; - version = "3.13.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "099b0b274dc000faf724df835579c76306e60200a5ba7b600a0c4b76dabbf344"; - }; - - nativeBuildInputs = [ pytestrunner ]; - - checkInputs = [ - lz4 - mock - pandas - pkgconfig - pytest - requests - xxhash - ] ++ lib.optional isPy27 backports_lzma; - - propagatedBuildInputs = [ - numpy - cachetools - uproot-methods - awkward - ]; - - # skip tests which do network calls - # test_compression.py is missing zstandard package - checkPhase = '' - pytest tests -k 'not hist_in_tree \ - and not branch_auto_interpretation' \ - --ignore=tests/test_compression.py - ''; - - meta = with lib; { - homepage = "https://github.com/scikit-hep/uproot"; - description = "ROOT I/O in pure Python and Numpy"; - license = licenses.bsd3; - maintainers = with maintainers; [ ktf ]; - }; -} diff --git a/pkgs/development/python-modules/uproot3-methods/default.nix b/pkgs/development/python-modules/uproot3-methods/default.nix new file mode 100644 index 0000000000000..3a9457a574baa --- /dev/null +++ b/pkgs/development/python-modules/uproot3-methods/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, numpy +, awkward0 +}: + +buildPythonPackage rec { + version = "0.10.0"; + pname = "uproot3-methods"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rk9i1ra3panli96ghz80ddpqk77xb1kpxs3wf8rw0jy5d88pc26"; + }; + + nativeBuildInputs = [ awkward0 ]; + + propagatedBuildInputs = [ numpy awkward0 ]; + + # No tests on PyPi + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://github.com/scikit-hep/uproot3-methods"; + description = "Pythonic mix-ins for ROOT classes"; + license = licenses.bsd3; + maintainers = with maintainers; [ costrouc SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/uproot3/default.nix b/pkgs/development/python-modules/uproot3/default.nix new file mode 100644 index 0000000000000..0d0c2365b6379 --- /dev/null +++ b/pkgs/development/python-modules/uproot3/default.nix @@ -0,0 +1,44 @@ +{ lib, fetchFromGitHub, buildPythonPackage, isPy27 +, awkward0, backports_lzma, cachetools, lz4, pandas +, pytestCheckHook, pytestrunner, pkgconfig, mock +, numpy, requests, uproot3-methods, xxhash, zstandard +}: + +buildPythonPackage rec { + pname = "uproot3"; + version = "3.14.1"; + + src = fetchFromGitHub { + owner = "scikit-hep"; + repo = "uproot3"; + rev = version; + sha256 = "1npwh4l96wg3m24jhfc8i84nfwfc18flrmymf80fx101wmpi2qz8"; + }; + + nativeBuildInputs = [ pytestrunner ]; + + propagatedBuildInputs = [ + awkward0 + cachetools + lz4 + numpy + uproot3-methods + xxhash + zstandard + ] ++ lib.optional isPy27 backports_lzma; + + checkInputs = [ + mock + pandas + pkgconfig + pytestCheckHook + requests + ] ++ lib.optional isPy27 backports_lzma; + + meta = with lib; { + homepage = "https://github.com/scikit-hep/uproot3"; + description = "ROOT I/O in pure Python and Numpy"; + license = licenses.bsd3; + maintainers = with maintainers; [ ktf SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/wsnsimpy/default.nix b/pkgs/development/python-modules/wsnsimpy/default.nix new file mode 100644 index 0000000000000..febb66605c8a6 --- /dev/null +++ b/pkgs/development/python-modules/wsnsimpy/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage, fetchPypi, isPy27, lib, setuptools, simpy, tkinter +# GUI-based visualization of the simulation is optional +, enableVisualization ? true }: + +buildPythonPackage rec { + pname = "wsnsimpy"; + version = "0.2.5"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1b7fdqwc2v9alfwf2fr0aqr8rf2pb5lpm4anpilmvrh2lhjar4i2"; + }; + + propagatedBuildInputs = [ setuptools simpy ] + ++ lib.optional enableVisualization tkinter; + + # No test cases are included, thus unittest tries to run the examples, which + # fail because no DISPLAYs are available. + doCheck = false; + + pythonImportsCheck = [ "wsnsimpy" ] + ++ lib.optional enableVisualization "wsnsimpy.wsnsimpy_tk"; + + meta = with lib; { + description = "SimPy-based WSN Simulator"; + homepage = "https://pypi.org/project/wsnsimpy/"; + license = licenses.bsd2; + maintainers = with maintainers; [ dmrauh ]; + }; +} diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index d21142f5dc0db..8cb5b5f0777aa 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xkcdpass"; - version = "1.17.3"; + version = "1.17.6"; src = fetchPypi { inherit pname version; - sha256 = "95cf3fd41130606ba64ec7edb9efac7c5d61efe21abab51a2c21ccbbebc48bb6"; + sha256 = "0ghsjs5bxl996pap910q9s21nywb26mfpjd92rbfywbnj8f2k2cy"; }; # No tests included diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index b3e651fd2b0eb..83f9c7a9980b5 100644 --- a/pkgs/development/python-modules/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -1,6 +1,8 @@ { lib +, nixosTests , buildPythonPackage , fetchPypi +, substituteAll , pkgs , argcomplete , pyyaml @@ -22,6 +24,13 @@ buildPythonPackage rec { sha256 = "1q4rky0a6n4izmq7slb91a54g8swry1xrbfqxwc8lkd3hhvlxxkl"; }; + patches = [ + (substituteAll { + src = ./jq-path.patch; + jq = "${lib.getBin pkgs.jq}/bin/jq"; + }) + ]; + postPatch = '' substituteInPlace test/test.py --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}" ''; @@ -38,7 +47,6 @@ buildPythonPackage rec { pytest coverage flake8 - pkgs.jq toml ]; @@ -46,6 +54,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "yq" ]; + passthru.tests = { inherit (nixosTests) yq; }; + meta = with lib; { description = "Command-line YAML processor - jq wrapper for YAML documents"; homepage = "https://github.com/kislyuk/yq"; diff --git a/pkgs/development/python-modules/yq/jq-path.patch b/pkgs/development/python-modules/yq/jq-path.patch new file mode 100644 index 0000000000000..784a28feaf187 --- /dev/null +++ b/pkgs/development/python-modules/yq/jq-path.patch @@ -0,0 +1,26 @@ +diff --git a/test/test.py b/test/test.py +index a81f41b..9e80f04 100755 +--- a/test/test.py ++++ b/test/test.py +@@ -112,7 +112,7 @@ class TestYq(unittest.TestCase): + tf2.seek(0) + self.assertEqual(self.run_yq("", ["-y", arg, tf.name, self.fd_path(tf2)]), '1\n...\n') + +- @unittest.skipIf(subprocess.check_output(["jq", "--version"]) < b"jq-1.6", "Test options introduced in jq 1.6") ++ @unittest.skipIf(subprocess.check_output(["@jq@", "--version"]) < b"jq-1.6", "Test options introduced in jq 1.6") + def test_jq16_arg_passthrough(self): + self.assertEqual(self.run_yq("{}", ["--indentless", "-y", ".a=$ARGS.positional", "--args", "a", "b"]), + "a:\n- a\n- b\n") +diff --git a/yq/__init__.py b/yq/__init__.py +index afeb42c..a0d7970 100755 +--- a/yq/__init__.py ++++ b/yq/__init__.py +@@ -146,7 +146,7 @@ def yq(input_streams=None, output_stream=None, input_format="yaml", output_forma + + try: + # Note: universal_newlines is just a way to induce subprocess to make stdin a text buffer and encode it for us +- jq = subprocess.Popen(["jq"] + list(jq_args), ++ jq = subprocess.Popen(["@jq@"] + list(jq_args), + stdin=subprocess.PIPE, + stdout=subprocess.PIPE if converting_output else None, + universal_newlines=True) diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index d57416ac18a48..95626c802badc 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "zstd"; - version = "1.4.5.1"; + version = "1.4.8.1"; src = fetchPypi { inherit pname version; - sha256 = "2a1806d625bd2d8944ead4b3018fc6444a31467fa09935e9c1d4296275f024c6"; + sha256 = "b62b21eb850abd6b8c0046bfc1c5c773c873eeb94f1904ef1ff304e98b62b80e"; }; postPatch = '' diff --git a/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch b/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch index bcb3ac1d146af..16470740877e3 100644 --- a/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch +++ b/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch @@ -1,22 +1,24 @@ -From 6ab08bc1c889e4fb9a39432b1a654eaa19ee65eb Mon Sep 17 00:00:00 2001 -From: Austin Seipp <aseipp@pobox.com> -Date: Fri, 2 May 2014 12:28:23 -0500 -Subject: [PATCH] Fix scan-build to use NIX_CFLAGS_COMPILE +From 40239d92957f1969652cdd41d6d2749c41ac4338 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Fri, 31 Jul 2020 09:22:03 +0100 +Subject: [PATCH] [PATCH] Fix scan-build to use NIX_CFLAGS_COMPILE +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit -Signed-off-by: Austin Seipp <aseipp@pobox.com> +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> --- - tools/scan-build/ccc-analyzer | 9 +++++++++ - 1 file changed, 9 insertions(+) + tools/scan-build/libexec/ccc-analyzer | 8 ++++++++ + 1 file changed, 8 insertions(+) -diff --git a/tools/scan-build/ccc-analyzer b/tools/scan-build/ccc-analyzer -index b463ec0..9d39dd0 100755 ---- a/tools/scan-build/ccc-analyzer -+++ b/tools/scan-build/ccc-analyzer -@@ -207,6 +207,15 @@ sub Analyze { - push @Args, "-Xclang", "-analyzer-viz-egraph-ubigraph"; +diff --git a/tools/scan-build/libexec/ccc-analyzer b/tools/scan-build/libexec/ccc-analyzer +index 800f38b5..0fb50fb3 100755 +--- a/tools/scan-build/libexec/ccc-analyzer ++++ b/tools/scan-build/libexec/ccc-analyzer +@@ -246,6 +246,14 @@ sub Analyze { + push @Args, "-target", $AnalyzerTarget; } -+ + # Add Nix flags to analysis + if (defined $ENV{'NIX_CFLAGS_COMPILE'}) { + my @nixArgs = split(/\s+/, $ENV{'NIX_CFLAGS_COMPILE'}); @@ -25,9 +27,9 @@ index b463ec0..9d39dd0 100755 + } + } + - my $AnalysisArgs = GetCCArgs("--analyze", \@Args); + my $AnalysisArgs = GetCCArgs($HtmlDir, "--analyze", \@Args); @CmdArgs = @$AnalysisArgs; } -- -1.8.3.2 +2.27.0 diff --git a/pkgs/development/tools/analysis/clang-analyzer/default.nix b/pkgs/development/tools/analysis/clang-analyzer/default.nix index 6b0c1b401f630..43b32052bf3cf 100644 --- a/pkgs/development/tools/analysis/clang-analyzer/default.nix +++ b/pkgs/development/tools/analysis/clang-analyzer/default.nix @@ -1,26 +1,24 @@ -{ stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper }: +{ stdenv, fetchurl, clang, llvmPackages, perl, makeWrapper, python3 }: stdenv.mkDerivation rec { pname = "clang-analyzer"; - version = "3.4"; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz"; - sha256 = "06rb4j1ifbznl3gfhl98s7ilj0ns01p7y7zap4p7ynmqnc6pia92"; - }; + inherit (llvmPackages.clang-unwrapped) src version; patches = [ ./0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch ]; - buildInputs = [ clang llvmPackages.clang perl makeWrapper ]; + buildInputs = [ clang llvmPackages.clang perl python3 ]; + nativeBuildInputs = [ makeWrapper ]; dontBuild = true; installPhase = '' - mkdir -p $out/bin $out/libexec - cp -R tools/scan-view $out/libexec - cp -R tools/scan-build $out/libexec + mkdir -p $out/share/scan-view $out/bin + cp -R tools/scan-view/share/* $out/share/scan-view + cp -R tools/scan-view/bin/* $out/bin/scan-view + cp -R tools/scan-build/* $out + + rm $out/bin/*.bat $out/libexec/*.bat $out/CMakeLists.txt - makeWrapper $out/libexec/scan-view/scan-view $out/bin/scan-view - makeWrapper $out/libexec/scan-build/scan-build $out/bin/scan-build \ + wrapProgram $out/bin/scan-build \ --add-flags "--use-cc=${clang}/bin/clang" \ --add-flags "--use-c++=${clang}/bin/clang++" \ --add-flags "--use-analyzer='${llvmPackages.clang}/bin/clang'" diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index e10052203edb1..7d66264564b0b 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,21 +2,21 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.27.0"; + version = "0.36.10"; src = fetchFromGitHub { - owner = "liamg"; + owner = "tfsec"; repo = pname; rev = "v${version}"; - sha256 = "12n6l18g0kg28clzyzwc2lq9rnch3vshp07isgvfp7193bhf8hyv"; + sha256 = "11kv13d4cw515r79azfha1ksmvsha1rvg0jak9nvz9ggivyn0s7a"; }; - goPackagePath = "github.com/liamg/tfsec"; + goPackagePath = "github.com/tfsec/tfsec"; buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version}" ]; meta = with lib; { - homepage = "https://github.com/liamg/tfsec"; + homepage = "https://github.com/tfsec/tfsec"; description = "Static analysis powered security scanner for your terraform code"; license = licenses.mit; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 43a70c6a765d5..66560e768d23a 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "bazel-buildtools"; - version = "3.3.0"; + version = "3.5.0"; goPackagePath = "github.com/bazelbuild/buildtools"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "bazelbuild"; repo = "buildtools"; rev = version; - sha256 = "0g411gjbm02qd5b50iy6kk81kx2n5zw5x1m6i6g7nrmh38p3pn9k"; + sha256 = "179k0kwh7i2azkhk8dw7ac50a05q7n3i29pqaf69yw7jrpbf8k85"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index ef8a5324487d0..385cb990c468d 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -38,6 +38,12 @@ stdenv.mkDerivation rec { # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d ./libuv-application-services.patch + # Fix namelink failures, can be removed in 3.19.2+ + (fetchpatch { + url = "https://gitlab.kitware.com/cmake/cmake/-/commit/38bcb5c0a3accd2dd29fb7632c6b3bf31b990d82.patch"; + sha256 = "17yr66wrayhmavsz46b37zfwp2jcwab1zig2xqps39ysndf74qjc"; + }) + ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; outputs = [ "out" ]; diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 713f499ce2b2a..f1445970f6a76 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,17 +3,17 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.9.1"; + version = "2.9.5"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "1h0gpzpr7xk6hvmrrq41bcp2k9aai348baf8ad9bxvci01n4zb12"; + sha256 = "12kv3286a2vkm3qpm2msiks87mkspxddgl7bwiacdias9dfda09n"; }; jarsrc = fetchurl { # NOTE: This is actually a .jar, Github has issues url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.zip"; - sha256 = "1y2mva5s2w2szzn1b9rhz0dvkffls4ravii677ybcf2w9wd86z7a"; + sha256 = "1shyvg1471sc3bv4h3ax51626xw8a8w05f43bny6gmp8pyc0qjfz"; }; JARNAME = "${pname}-${version}-standalone.jar"; @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { description = "Project automation for Clojure"; license = stdenv.lib.licenses.epl10; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ thiagokokada ]; }; } diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 8f01b9aca3188..1dd931981dad4 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "3.10.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 3b433ea5e77a1..24c2bdd2af319 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "be2f5d98f13884a18eaf5205458f985575dbe13a"; - version = "2020-11-23"; + rev = "4db8d5c27413f69297adfffac57485d88d73c60e"; + version = "2020-12-26"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "00acnj357fcwx7w25axaj0l5ync97ixsixg8s55r7hwibkxn0fa7"; + sha256 = "B8abzdohkw3aPhbENJ2vxZFLWhIpf0HF/uv+WJbVRYg="; }; dontBuild = true; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 39832109d9956..a9314cef0cc38 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "wFxv20NfMMcw4yP8wbmLow8189jExDxkSIRqK2Ix/6U="; + sha256 = "sha256-hqbyjnmWYHQQEGarGqGSZ9DI1E6uIdqpPJxgVspvnaQ="; }; patchPhase = '' diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index dc990af910fe2..cf422fc2e0755 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -3,13 +3,9 @@ , crystal_0_34 , crystal_0_35 }: - let - generic = ( - { version - , sha256 - , crystal - }: + generic = + { version, sha256, crystal }: crystal.buildCrystalPackage { pname = "shards"; @@ -17,12 +13,12 @@ let src = fetchFromGitHub { owner = "crystal-lang"; - repo = "shards"; - rev = "v${version}"; + repo = "shards"; + rev = "v${version}"; inherit sha256; }; - # we cannot use `make` here as it would introduce a dependency on itself + # we cannot use `make` or `shards` here as it would introduce a cyclical dependency format = "crystal"; shardsFile = ./shards.nix; crystalBinaries.shards.src = "./src/shards.cr"; @@ -36,10 +32,10 @@ let maintainers = with maintainers; [ peterhoeg ]; inherit (crystal.meta) homepage platforms; }; - } - ); + }; -in rec { +in +rec { shards_0_11 = generic { version = "0.11.1"; sha256 = "05qnhc23xbmicdl4fwyxfpcvd8jq4inzh6v7jsjjw4n76vzb1f71"; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 223b814708d39..82ac155657428 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -4,8 +4,6 @@ buildGoModule rec { name = "buildkite-agent-${version}"; version = "3.26.0"; - goPackagePath = "github.com/buildkite/agent"; - src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index db2d228ce4544..3d127591bd0f6 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.6.0"; + version = "13.7.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 = "0q1f4dmdkqrdzs3mb5wk6k6x50li4c7js0blzfcz3f3n8gm925jw"; + sha256 = "0hbzvw6bdy31yqnri7379gpm8n5nv6ayr1idg02c9zqgcsgm34jf"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1hxjqk4in1a2abcyxj7556fcscxq4cfy24cgcmh1qhvirnm5j6mc"; + sha256 = "036drxlkmm35mdl0f5k79hnmwvf8gadgsxx71jprn1fjjzk3cxmz"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0vwky4hdkh1qvd61zdf2avbbnn3ya6pdicqggh2fx7k04pnp05mh"; + sha256 = "0v2wcalvs7gsbi33jm35k01cqv2iqz3k3yfjjw08dssg358d0vfp"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 0d42bcff7cf6e..a0f69033923c7 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.7"; + version = "2.0.8"; 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 = "1m6b12cqbwsk4xf2r79y51154j6ws6f0kiw1yj57gylw7pjkgfnk"; + sha256 = "sha256-7dNJUMZu6YY3076cnjWHRisJZVn1NPRH1VC+cJjfI/8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index bdb2f8cbd7572..6eb24a812aaaa 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1fv92f71p7pk3r4aj88kgaiblfii3z4fjbchyj1c9k6br0gwbw8b"; + sha256 = "0k3vrz12dgfirz9p4ckgk2swr42w8fl50hdgg8pwc7yh2jsz8zl0"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix index 163926f0e5858..ee18a72216dc6 100644 --- a/pkgs/development/tools/database/litecli/default.nix +++ b/pkgs/development/tools/database/litecli/default.nix @@ -1,8 +1,8 @@ -{ lib, python3Packages, fetchpatch }: +{ lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "litecli"; - version = "1.4.1"; + version = "1.5.0"; # Python 2 won't have prompt_toolkit 2.x.x # See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408 @@ -10,17 +10,9 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "FARWjtbS5zi/XQDyAVImUmArLj8xATz1jZ4jnXFdq1w="; + sha256 = "b09f0804d26b018360b240778612390810e8e00ea0f79d5412fd0d4775c0e3cd"; }; - patches = [ - # Fix compatibility with sqlparse >= 0.4.0. Remove with the next release - (fetchpatch { - url = "https://github.com/dbcli/litecli/commit/37957e401d22f88800bbdec2c690e731f2cc13bd.patch"; - sha256 = "1x82s2h1rzflyiahyd8pfya30rzs6yx6ij4a4s16f8iix5x35zv9"; - }) - ]; - propagatedBuildInputs = with python3Packages; [ cli-helpers click @@ -31,23 +23,17 @@ python3Packages.buildPythonApplication rec { ]; checkInputs = with python3Packages; [ - pytest + pytestCheckHook mock ]; - preCheck = '' - export XDG_CONFIG_HOME=$TMP - # add missing file - mkdir -p tests/data - echo -e "t1,11\nt2,22\n" > tests/data/import_data.csv - ''; - meta = with lib; { description = "Command-line interface for SQLite"; longDescription = '' A command-line client for SQLite databases that has auto-completion and syntax highlighting. ''; homepage = "https://litecli.com"; + changelog = "https://github.com/dbcli/litecli/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ Scriptkiddi ]; }; diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index 36a85e6361cb9..b4c26d6fb5c25 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -1,52 +1,61 @@ -{ buildPythonApplication, lib, fetchPypi, isPy3k, fetchpatch -, cli-helpers, click, configobj, humanize, prompt_toolkit, psycopg2 -, pygments, sqlparse, pgspecial, setproctitle, keyring, pytest, mock +{ stdenv +, buildPythonApplication +, fetchPypi +, isPy3k +, cli-helpers +, click +, configobj +, humanize +, prompt_toolkit +, psycopg2 +, pygments +, sqlparse +, pgspecial +, setproctitle +, keyring +, pendulum +, pytestCheckHook +, mock }: buildPythonApplication rec { pname = "pgcli"; - version = "3.0.0"; + version = "3.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "10j01bd031fys1vcihibsi5rrfd8w1kgahpcsbk4l07871c24829"; + sha256 = "d5b2d803f7e4e7fe679306a000bde5d14d15ec590ddd108f3dc4c0ecad169d2b"; }; propagatedBuildInputs = [ - cli-helpers click configobj humanize prompt_toolkit psycopg2 - pygments sqlparse pgspecial setproctitle keyring + cli-helpers + click + configobj + humanize + prompt_toolkit + psycopg2 + pygments + sqlparse + pgspecial + setproctitle + keyring + pendulum ]; - patches = [ - (fetchpatch { - name = "enable-sqlparse-4.patch"; - url = "https://github.com/dbcli/pgcli/pull/1224/commits/55d534d41051887c637b6300e08a9f70e6656020.patch"; - sha256 = "01r8qc7qzb6mz0xq2xnrgyackbapf43ng6l88qpzd9lw2pwksc8w"; - includes = [ "pgcli/packages/parseutils/ctes.py" "tests/test_sqlcompletion.py" "setup.py" ]; - }) - ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "prompt_toolkit>=2.0.6,<3.0.0" "prompt_toolkit" - ''; - - checkInputs = [ pytest mock ]; + checkInputs = [ pytestCheckHook mock ]; - # `test_application_name_db_uri` fails: https://github.com/dbcli/pgcli/issues/1104 - checkPhase = '' - pytest --deselect=tests/test_main.py::test_application_name_db_uri - ''; + disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Command-line interface for PostgreSQL"; longDescription = '' Rich command-line interface for PostgreSQL with auto-completion and syntax highlighting. ''; homepage = "https://pgcli.com"; + changelog = "https://github.com/dbcli/pgcli/blob/v${version}/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ dywedir ]; }; diff --git a/pkgs/development/tools/github-commenter/default.nix b/pkgs/development/tools/github-commenter/default.nix index 8d25710aa2dca..05784c47eff1c 100644 --- a/pkgs/development/tools/github-commenter/default.nix +++ b/pkgs/development/tools/github-commenter/default.nix @@ -13,8 +13,6 @@ buildGoModule rec { vendorSha256 = "Gw+cR5sA5MGuclcvur8olmRtK04LDP5vKJ5k7yZO3B0="; - goPackagePath = "github.com/cloudposse/${pname}"; - meta = with lib; { description = "Command line utility for creating GitHub comments on Commits, Pull Request Reviews or Issues"; license = licenses.asl20; diff --git a/pkgs/development/tools/go-minimock/default.nix b/pkgs/development/tools/go-minimock/default.nix new file mode 100644 index 0000000000000..ed4374e77640b --- /dev/null +++ b/pkgs/development/tools/go-minimock/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "go-minimock"; + version = "3.0.8"; + + src = fetchFromGitHub { + owner = "gojuno"; + repo = "minimock"; + rev = "v${version}"; + sha256 = "0r0krbwvx5w1z0yv2qqi92irbsfhkvwvaigy350cvcz9gmcppj4h"; + }; + + vendorSha256 = "1macwm6hybjinwnx62v146yxydcn5k5r587nxwkf4ffy76s2m3jc"; + + doCheck = true; + + subPackages = [ "cmd/minimock" "." ]; + + meta = with lib; { + homepage = "https://github.com/gojuno/minimock"; + description = "A golang mock generator from interfaces"; + license = licenses.mit; + maintainers = with maintainers; [ svrana ]; + }; +} diff --git a/pkgs/development/tools/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix index a19e057591365..e33d731dae43c 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/default.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/default.nix @@ -2,39 +2,39 @@ , bytestring, containers, data-default, deepseq, directory, extra , fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th , ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios -, hls-hlint-plugin, hls-plugin-api, hls-tactics-plugin, hslogger -, hspec, hspec-core, lens, lsp-test, mtl, optparse-applicative -, optparse-simple, ormolu, process, regex-tdfa, retrie -, safe-exceptions, shake, stdenv, stm, stylish-haskell, tasty -, tasty-ant-xml, tasty-expected-failure, tasty-golden, tasty-hunit -, tasty-rerun, temporary, text, time, transformers -, unordered-containers, yaml +, hls-explicit-imports-plugin, hls-hlint-plugin, hls-plugin-api +, hls-retrie-plugin, hls-tactics-plugin, hslogger, hspec +, hspec-core, lens, lsp-test, mtl, optparse-applicative +, optparse-simple, ormolu, process, regex-tdfa, safe-exceptions +, shake, stdenv, stm, stylish-haskell, tasty, tasty-ant-xml +, tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun +, temporary, text, time, transformers, unordered-containers, yaml }: mkDerivation { pname = "haskell-language-server"; - version = "0.6.0.0"; + version = "0.7.1.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj"; - rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c"; + sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; + rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; fetchSubmodules = true; }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers data-default directory extra filepath ghc ghcide - gitrev haskell-lsp hie-bios hls-plugin-api hslogger - optparse-applicative optparse-simple process text - unordered-containers + gitrev haskell-lsp hls-plugin-api hslogger optparse-applicative + optparse-simple process shake text unordered-containers ]; executableHaskellDepends = [ aeson base binary brittany bytestring containers deepseq directory extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide - gitrev hashable haskell-lsp hie-bios hls-hlint-plugin - hls-plugin-api hls-tactics-plugin hslogger lens mtl - optparse-applicative optparse-simple ormolu process regex-tdfa - retrie safe-exceptions shake stylish-haskell temporary text time - transformers unordered-containers + gitrev hashable haskell-lsp hie-bios hls-explicit-imports-plugin + hls-hlint-plugin hls-plugin-api hls-retrie-plugin + hls-tactics-plugin hslogger lens mtl optparse-applicative + optparse-simple ormolu process regex-tdfa safe-exceptions shake + stylish-haskell temporary text time transformers + unordered-containers ]; testHaskellDepends = [ aeson base blaze-markup bytestring containers data-default diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-brittany.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-brittany.nix deleted file mode 100644 index 0519cf42dd8c2..0000000000000 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-brittany.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ mkDerivation, aeson, base, butcher, bytestring, cmdargs -, containers, czipwith, data-tree-print, deepseq, directory, extra -, fetchgit, filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths -, hspec, monad-memo, mtl, multistate, parsec, pretty, random, safe -, semigroups, stdenv, strict, syb, text, transformers, uniplate -, unsafe, yaml -}: -mkDerivation { - pname = "brittany"; - version = "0.12.1.1"; - src = fetchgit { - url = "https://github.com/bubba/brittany"; - sha256 = "1rkk09f8750qykrmkqfqbh44dbx1p8aq1caznxxlw8zqfvx39cxl"; - rev = "c59655f10d5ad295c2481537fc8abf0a297d9d1c"; - fetchSubmodules = true; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory extra filepath ghc ghc-boot-th - ghc-exactprint ghc-paths monad-memo mtl multistate pretty random - safe semigroups strict syb text transformers uniplate unsafe yaml - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - aeson base butcher bytestring cmdargs containers czipwith - data-tree-print deepseq directory extra filepath ghc ghc-boot-th - ghc-exactprint ghc-paths hspec monad-memo mtl multistate parsec - pretty safe semigroups strict syb text transformers uniplate unsafe - yaml - ]; - homepage = "https://github.com/lspitzner/brittany/"; - description = "Haskell source code formatter"; - license = stdenv.lib.licenses.agpl3; -} diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix new file mode 100644 index 0000000000000..7c3b22cf1d0a0 --- /dev/null +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix @@ -0,0 +1,21 @@ +{ mkDerivation, aeson, base, containers, deepseq, fetchgit, ghc +, ghcide, haskell-lsp-types, hls-plugin-api, shake, stdenv, text +, unordered-containers +}: +mkDerivation { + pname = "hls-explicit-imports-plugin"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/haskell/haskell-language-server.git"; + sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; + rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/plugins/hls-explicit-imports-plugin; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + aeson base containers deepseq ghc ghcide haskell-lsp-types + hls-plugin-api shake text unordered-containers + ]; + description = "Explicit imports plugin for Haskell Language Server"; + license = stdenv.lib.licenses.asl20; +} diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix index 3a730dc716427..8bfcf034bd2b6 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-hlint-plugin.nix @@ -10,8 +10,8 @@ mkDerivation { version = "0.1.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj"; - rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c"; + sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; + rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot"; diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix new file mode 100644 index 0000000000000..7a44903f9870b --- /dev/null +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-retrie-plugin.nix @@ -0,0 +1,23 @@ +{ mkDerivation, aeson, base, containers, deepseq, directory, extra +, fetchgit, ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types +, hls-plugin-api, retrie, safe-exceptions, shake, stdenv, text +, transformers, unordered-containers +}: +mkDerivation { + pname = "hls-retrie-plugin"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/haskell/haskell-language-server.git"; + sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; + rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/plugins/hls-retrie-plugin; echo source root reset to $sourceRoot"; + libraryHaskellDepends = [ + aeson base containers deepseq directory extra ghc ghcide hashable + haskell-lsp haskell-lsp-types hls-plugin-api retrie safe-exceptions + shake text transformers unordered-containers + ]; + description = "Retrie integration plugin for Haskell Language Server"; + license = stdenv.lib.licenses.asl20; +} diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix index 3d168622fb7d7..326e8ce0cdf9a 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-tactics-plugin.nix @@ -1,8 +1,8 @@ { mkDerivation, aeson, base, checkers, containers, deepseq , directory, extra, fetchgit, filepath, fingertree, generic-lens , ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide -, haskell-lsp, hie-bios, hls-plugin-api, hspec, lens, mtl -, QuickCheck, refinery, retrie, shake, stdenv, syb, text +, haskell-lsp, hie-bios, hls-plugin-api, hspec, hspec-discover +, lens, mtl, QuickCheck, refinery, retrie, shake, stdenv, syb, text , transformers }: mkDerivation { @@ -10,8 +10,8 @@ mkDerivation { version = "0.5.1.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "027fq6752024wzzq9izsilm5lkq9gmpxf82rixbimbijw0yk4pwj"; - rev = "372a12e797069dc3ac4fa33dcaabe3b992999d7c"; + sha256 = "0gkzvjx4dgf53yicinqjshlj80gznx5khb62i7g3kqjr85iy0raa"; + rev = "e4f677e1780fe85a02b99a09404a0a3c3ab5ce7c"; fetchSubmodules = true; }; postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot"; @@ -25,8 +25,8 @@ mkDerivation { base checkers containers ghc hie-bios hls-plugin-api hspec mtl QuickCheck ]; - homepage = "https://github.com/isovector/hls-tactics-plugin#readme"; - description = "LSP server for GHC"; + testToolDepends = [ hspec-discover ]; + description = "Tactics plugin for Haskell Language Server"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; } diff --git a/pkgs/development/tools/haskell/haskell-language-server/update.sh b/pkgs/development/tools/haskell/haskell-language-server/update.sh index fbd97b5488a80..f14a97221ff84 100755 --- a/pkgs/development/tools/haskell/haskell-language-server/update.sh +++ b/pkgs/development/tools/haskell/haskell-language-server/update.sh @@ -16,23 +16,6 @@ set -eo pipefail script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" # =========================== -# HLS maintainer's Brittany fork -# =========================== - -# brittany derivation created with cabal2nix. -brittany_derivation_file="${script_dir}/hls-brittany.nix" - -# This is the current revision of the brittany fork in Nixpkgs. -brittany_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$brittany_derivation_file")" - -brittany_new_version=$(curl --silent "https://api.github.com/repos/bubba/brittany/commits/ghc-8.10.1" | jq '.sha' --raw-output) - -echo "Updating haskell-language-server's brittany from old version $brittany_old_version to new version $brittany_new_version." -echo "Running cabal2nix and outputting to ${brittany_derivation_file}..." - -cabal2nix --revision "$brittany_new_version" "https://github.com/bubba/brittany" > "$brittany_derivation_file" - -# =========================== # HLS # =========================== @@ -43,7 +26,18 @@ hls_derivation_file="${script_dir}/default.nix" hls_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$hls_derivation_file")" # This is the latest release version of hls on GitHub. -hls_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/commits/master" | jq '.sha' --raw-output) +# Get all tag names, filter to the hls ones (no prefix like 'hls-plugin-api-'), +# sort for the latest one and select just that +hls_latest_release=$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/haskell/haskell-language-server/tags | + jq --raw-output 'map(.name) | .[]' | + grep '^[0-9]' | + sort --version-sort | + tail -n1) + +# Use this value instead for the very latest revision +# hls_head=(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/commits/master" | jq '.sha' --raw-output) + +hls_new_version=$hls_latest_release echo "Updating haskell-language-server from old version $hls_old_version to new version $hls_new_version." echo "Running cabal2nix and outputting to ${hls_derivation_file}..." @@ -51,5 +45,7 @@ echo "Running cabal2nix and outputting to ${hls_derivation_file}..." cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file" cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix" cabal2nix --revision "$hls_new_version" --subpath plugins/hls-hlint-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-hlint-plugin.nix" +cabal2nix --revision "$hls_new_version" --subpath plugins/hls-explicit-imports-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-explicit-imports-plugin.nix" +cabal2nix --revision "$hls_new_version" --subpath plugins/hls-retrie-plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-retrie-plugin.nix" echo "Finished." diff --git a/pkgs/development/tools/knightos/kcc/default.nix b/pkgs/development/tools/knightos/kcc/default.nix index 2ec7d7f202050..364d46de56d95 100644 --- a/pkgs/development/tools/knightos/kcc/default.nix +++ b/pkgs/development/tools/knightos/kcc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "kcc"; - version = "4.0.0"; + version = "4.0.4"; src = fetchFromGitHub { owner = "KnightOS"; repo = "kcc"; rev = version; - sha256 = "1cd226nqbxq32mppkljavq1kb74jqfqns9r7fskszr42hbygynk4"; + sha256 = "13sbpv8ynq8sjackv93jqxymk0bsy76c5fc0v29wz97v53q3izjp"; }; nativeBuildInputs = [ cmake bison flex ]; diff --git a/pkgs/development/tools/knightos/kimg/default.nix b/pkgs/development/tools/knightos/kimg/default.nix index bd4320637dc2d..3f3f698693df9 100644 --- a/pkgs/development/tools/knightos/kimg/default.nix +++ b/pkgs/development/tools/knightos/kimg/default.nix @@ -1,27 +1,25 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, imagemagick }: +{ stdenv, fetchFromGitHub, cmake, asciidoc }: stdenv.mkDerivation rec { pname = "kimg"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "KnightOS"; repo = "kimg"; rev = version; - sha256 = "00gj420m0jvhgm8kkslw8r69nl7r73bxrh6gqs2mx16ymcpkanpk"; + sha256 = "040782k3rh2a5mhbfgr9gnbfis0wgxvi27vhfn7l35vrr12sw1l3"; }; - nativeBuildInputs = [ cmake asciidoc pkg-config ]; - - buildInputs = [ imagemagick ]; + nativeBuildInputs = [ cmake asciidoc ]; hardeningDisable = [ "format" ]; meta = with stdenv.lib; { homepage = "https://knightos.org/"; - description = "Converts image formats supported by ImageMagick to the KnightOS image format"; + description = "Converts image formats supported by stb_image to the KnightOS image format"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; - platforms = platforms.unix; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/knightos/scas/default.nix b/pkgs/development/tools/knightos/scas/default.nix index 2269c3781a536..b87650d5bf95b 100644 --- a/pkgs/development/tools/knightos/scas/default.nix +++ b/pkgs/development/tools/knightos/scas/default.nix @@ -1,26 +1,26 @@ { fetchFromGitHub, stdenv, cmake }: - stdenv.mkDerivation rec { pname = "scas"; - version = "0.4.6"; + version = "0.5.3"; src = fetchFromGitHub { owner = "KnightOS"; repo = "scas"; rev = version; - sha256 = "1c6s9nivbwgv0f8n7j73h54ydgqw5dcpq8l752dfrnqg3kv3nn0h"; + sha256 = "0z6r07cl92kq860ddas5p88l990ih9cfqlzy5y4mk5hrmjzya60j"; }; - nativeBuildInputs = [ cmake ]; + cmakeFlags = [ "-DSCAS_LIBRARY=1" ]; - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { homepage = "https://knightos.org/"; description = "Assembler and linker for the Z80"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/knightos/z80e/default.nix b/pkgs/development/tools/knightos/z80e/default.nix index 6aad8f687e703..d8f6a12740328 100644 --- a/pkgs/development/tools/knightos/z80e/default.nix +++ b/pkgs/development/tools/knightos/z80e/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z80e"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "KnightOS"; repo = "z80e"; rev = version; - sha256 = "18nnip6nv1pq19bxgd07fv7ci3c5yj8d9cip97a4zsfab7bmbq6k"; + sha256 = "0gdv17ynjd6zf3i4hkimd89xkrd8kxas3bf8d5sq54fdicapvkzc"; }; nativeBuildInputs = [ cmake knightos-scas ]; diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index b04a42d57b6bd..1ede21609b44c 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.23.7"; + version = "0.24.2"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "05s0rj785dm9dqr30ak5hi26qy0z2w71zljyln5is4frckxkcvng"; + sha256 = "0hy13l1v2kcsn99dswlq1hl0ly18cal387zhnzjfqv51qng2q5kq"; }; vendorSha256 = null; @@ -19,6 +19,7 @@ buildGoModule rec { meta = with stdenv.lib; { description = "Simple terminal UI for git commands"; homepage = "https://github.com/jesseduffield/lazygit"; + changelog = "https://github.com/jesseduffield/lazygit/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fpletz equirosa Br1ght0ne ]; }; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index ac8a4c8bb7c96..ef04e78da6097 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.11508"; + version = "0.1.11540"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "1m0jy7h9mksgj85r4jcpb5nabcs9vrfbrky31acwbibzjxxw9afg"; + sha256 = "QtD+H59AlXp+3mXtUA44Dl+3xEvWdO8FybuBnL9sjBA="; }; - vendorSha256 = "15l9f87vgspdsxhwqdm56z3dvrspc8k1bbyvhhhnvqf3fkiki2bw"; + vendorSha256 = "fIk443TD4W0hhNuvFSZiV+fdxjelNsxh1+3qtw9yiZY="; doCheck = false; diff --git a/pkgs/development/tools/misc/docopts/default.nix b/pkgs/development/tools/misc/docopts/default.nix new file mode 100644 index 0000000000000..98a24ca5ebe45 --- /dev/null +++ b/pkgs/development/tools/misc/docopts/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "docopts"; + version = "0.6.3-rc2"; + + src = fetchFromGitHub { + owner = "docopt"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-PmsTkPT/sf70MKYLhHvjCDb2o3VQ1k7d++RUW7rcoAg="; + }; + + goPackagePath = "github.com/docopt/${pname}"; + + goDeps = ./deps.nix; + + subPackages = [ "./" ]; + + postInstall = '' + install -D -m 755 ./go/src/$goPackagePath/docopts.sh $out/bin/docopts.sh + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/docopt/${pname}"; + description = "docopt CLI tool for shell scripting"; + license = licenses.mit; + maintainers = [ maintainers.confus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/docopts/deps.nix b/pkgs/development/tools/misc/docopts/deps.nix new file mode 100644 index 0000000000000..8cc1686de7d6b --- /dev/null +++ b/pkgs/development/tools/misc/docopts/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/docopt/docopt-go"; + fetch = { + type = "git"; + url = "https://github.com/docopt/docopt.go"; + rev = "ee0de3bc6815ee19d4a46c7eb90f829db0e014b1"; # "0.6.2"; + sha256 = "sha256-0mCKIC5x7aauBL8ahXB9ExMfoTJl55HaafWWWPNRmUI="; + }; + } +] diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 4a1d1288a4c24..e32da3e67b71c 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; buildInputs = [ gettext libtool makeWrapper texinfo ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A cross-platform file change monitor with multiple backends"; homepage = "https://github.com/emcrisostomo/fswatch"; diff --git a/pkgs/development/tools/misc/mdctags/default.nix b/pkgs/development/tools/misc/mdctags/default.nix new file mode 100644 index 0000000000000..ac61702160125 --- /dev/null +++ b/pkgs/development/tools/misc/mdctags/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage { + pname = "mdctags"; + version = "unstable-2020-06-11"; # v0.1.0 does not build with our rust version + + src = fetchFromGitHub { + owner = "wsdjeg"; + repo = "mdctags.rs"; + rev = "0ed9736ea0c77e6ff5b560dda46f5ed0a983ed82"; + sha256 = "14gryhgh9czlkfk75ml0620c6v8r74i6h3ykkkmc7gx2z8h1jxrb"; + }; + + cargoSha256 = "01ap2w755vbr01nfqc5185mr2w9y32g0d4ahc3lw2x3m8qv0bh6x"; + + meta = { + description = "tags for markdown file"; + homepage = "https://github.com/wsdjeg/mdctags.rs"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pacien ]; + }; +} diff --git a/pkgs/development/tools/misc/rtss/default.nix b/pkgs/development/tools/misc/rtss/default.nix new file mode 100644 index 0000000000000..505e6d23ef703 --- /dev/null +++ b/pkgs/development/tools/misc/rtss/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "rtss"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "Freaky"; + repo = pname; + rev = "v${version}"; + sha256 = "1936w161mkbcwicrxn51b42pgir5yjiw85s74lbfq70nddw18nyn"; + }; + + cargoSha256 = "0nll5gg7fjh6sz3cscarknb0gaivmzkcxhwdb2li47r74rcbrj36"; + + meta = with lib; { + description = "Annotate output with relative durations between lines"; + homepage = "https://github.com/Freaky/rtss"; + license = licenses.mit; + maintainers = with maintainers; [ djanatyn ]; + }; +} diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 51c22199cc15a..843059b335628 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }: rustPlatform.buildRustPackage rec { - version = "0.2.13"; + version = "0.2.14"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = version; - sha256 = "19z9fdkn3bnr8q33m66h2by6bs6kmhw3a2lq2n8bywmnhrjwhxpw"; + sha256 = "1ahg3cpb9pbgpdjglnfxm5c8r8qrgwaxwz5s394478ix7f9dxind"; }; - cargoSha256 = "1pm7il0x7i9mqx4vsmkcs8nq0dqr5ck3x3x7la6k39igaxn9vkwz"; + cargoSha256 = "0jphs0frr399iywi9ch8g271igayzv1vi3wa4v3yx19xdxawlgda"; cargoBuildFlags = [ "--features=all" ]; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index 66d40ae312799..5e3c3bc37c642 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -1,32 +1,46 @@ -{ name, stdenv, perl, makeWrapper, sqitchModule, databaseModule, shortenPerlShebang }: +{ stdenv +, lib +, perlPackages +, makeWrapper +, shortenPerlShebang +, mysqlSupport ? false +, postgresqlSupport ? false +}: + +let + sqitch = perlPackages.AppSqitch; + modules = with perlPackages; [ ] + ++ lib.optional mysqlSupport DBDmysql + ++ lib.optional postgresqlSupport DBDPg; +in stdenv.mkDerivation { - name = "${name}-${sqitchModule.version}"; + pname = "sqitch"; + version = sqitch.version; - buildInputs = [ perl makeWrapper sqitchModule databaseModule ]; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; - src = sqitchModule; + src = sqitch; dontBuild = true; - nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - installPhase = '' mkdir -p $out/bin for d in bin/sqitch etc lib share ; do # make sure dest alreay exists before symlink # this prevents installing a broken link into the path - if [ -e ${sqitchModule}/$d ]; then - ln -s ${sqitchModule}/$d $out/$d + if [ -e ${sqitch}/$d ]; then + ln -s ${sqitch}/$d $out/$d fi done - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/sqitch ''; dontStrip = true; - postFixup = "wrapProgram $out/bin/sqitch --prefix PERL5LIB : $PERL5LIB"; + postFixup = '' + wrapProgram $out/bin/sqitch --prefix PERL5LIB : ${perlPackages.makeFullPerlPath modules} + ''; meta = { - platforms = stdenv.lib.platforms.unix; - inherit (sqitchModule.meta) license; + inherit (sqitch.meta) description homepage license platforms; }; } diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index a4fb72666ca6e..29edccf496ee4 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terracognita"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "1z0vf3x46w3glwvq185hgmfkg7xfq31c7d3yjhh8qkwbhkx4bga4"; + sha256 = "1f0wi5mlb9r7ncvyvgmcdfngxrzgbdv7hm2ckb8bwmzcki2h2255"; }; - vendorSha256 = "1dmv16v1c9sydbl1g69pgwvrhznd0a133giwrcbqi4cyg1fdb3sr"; + vendorSha256 = "015r7zvah7lk5rbkaqhh2abbv19ky1in3ngzzrdvhbcqfns25iqr"; doCheck = false; @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration"; homepage = "https://github.com/cycloidio/terracognita"; + changelog = "https://github.com/cycloidio/terracognita/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 763cd4fcdb454..220042079fd49 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -12,8 +12,6 @@ buildGoModule rec { }; vendorSha256 = "8NdeCD558r0tV+ZR4MvLl5CzeNj8cUGtqwvJ2ZhS7mI="; - goPackagePath = "github.com/hashicorp/terraform-ls"; - # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com doCheck = false; diff --git a/pkgs/development/tools/misc/unused/default.nix b/pkgs/development/tools/misc/unused/default.nix new file mode 100644 index 0000000000000..3e5f9c319ef82 --- /dev/null +++ b/pkgs/development/tools/misc/unused/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, rustPlatform, cmake }: +rustPlatform.buildRustPackage rec { + pname = "unused"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "unused-code"; + repo = pname; + rev = version; + sha256 = "06r6m7k570rdm9szghnp3g4r6ij0vp8apfanqzzxv2hd7gf8v62b"; + }; + + nativeBuildInputs = [ cmake ]; + + cargoSha256 = "1c0gj2wp0nydv0binxj3ikm5sm6y5z3pklp5b06dgvq02licz57a"; + + meta = with stdenv.lib; { + description = "A tool to identify potentially unused code"; + homepage = "https://unused.codes"; + license = licenses.mit; + maintainers = [ maintainers.lrworth ]; + }; +} diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix index e9e7f9d279ea1..a08aaac832e32 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, dune, js_of_ocaml-compiler +{ buildDunePackage, fetchFromGitHub, js_of_ocaml-compiler , camlp4, ocsigen_deriving }: -stdenv.mkDerivation rec { - version = "3.2.1"; - pname = "js_of_ocaml-camlp4"; +buildDunePackage rec { + version = "3.2.1"; + pname = "js_of_ocaml-camlp4"; - src = fetchFromGitHub { - owner = "ocsigen"; - repo = "js_of_ocaml"; - rev = version; - sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik"; - }; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = "js_of_ocaml"; + rev = version; + sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik"; + }; - inherit (js_of_ocaml-compiler) installPhase meta; + inherit (js_of_ocaml-compiler) meta; - buildInputs = [ ocaml findlib dune camlp4 ocsigen_deriving ]; - - buildPhase = "dune build -p js_of_ocaml-camlp4"; + buildInputs = [ camlp4 ocsigen_deriving ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index c0812c39a3e6c..f1398c2f7c7de 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -1,28 +1,28 @@ { lib, fetchurl, buildDunePackage -, ocaml, findlib, cmdliner, dune_2, cppo, yojson, ocaml-migrate-parsetree +, cmdliner, cppo, yojson, ppxlib , menhir }: buildDunePackage rec { - pname = "js_of_ocaml-compiler"; - version = "3.7.0"; - useDune2 = true; + pname = "js_of_ocaml-compiler"; + version = "3.8.0"; + useDune2 = true; - src = fetchurl { - url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; - sha256 = "0rw6cfkl3zlyav8q2w7grxxqjmg35mz5rgvmkiqb58nl4gmgzx6w"; - }; + src = fetchurl { + url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; + sha256 = "069jyiayxcgwnips3adxb3d53mzd4rrq2783b9fgmsiyzm545lcy"; + }; - nativeBuildInputs = [ ocaml findlib dune_2 cppo menhir ]; + nativeBuildInputs = [ cppo menhir ]; buildInputs = [ cmdliner ]; configurePlatforms = []; - propagatedBuildInputs = [ yojson ocaml-migrate-parsetree ]; + propagatedBuildInputs = [ yojson ppxlib ]; - meta = { - description = "Compiler from OCaml bytecode to Javascript"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.vbgl ]; - homepage = "https://ocsigen.org/js_of_ocaml/"; - }; + meta = { + description = "Compiler from OCaml bytecode to Javascript"; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://ocsigen.org/js_of_ocaml/"; + }; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 9a57b590d6cfa..25826e94eb3a1 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,16 +1,13 @@ -{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler -, ocaml-migrate-parsetree, ppx_tools_versioned, uchar +{ buildDunePackage, js_of_ocaml-compiler +, ppxlib, uchar }: -stdenv.mkDerivation { - pname = "js_of_ocaml"; +buildDunePackage { + pname = "js_of_ocaml"; - inherit (js_of_ocaml-compiler) version src installPhase meta; + inherit (js_of_ocaml-compiler) version src meta useDune2; - buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ]; - nativeBuildInputs = [ ocaml findlib dune_2 ]; + buildInputs = [ ppxlib ]; - propagatedBuildInputs = [ js_of_ocaml-compiler uchar ]; - - buildPhase = "dune build -p js_of_ocaml"; + propagatedBuildInputs = [ js_of_ocaml-compiler uchar ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index 2ad8578894f51..81b1a41614b0f 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -1,16 +1,13 @@ -{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler, js_of_ocaml-ppx -, ocaml-migrate-parsetree, ppx_tools_versioned +{ buildDunePackage, js_of_ocaml-compiler, js_of_ocaml-ppx , js_of_ocaml, ocaml_lwt, lwt_log }: -stdenv.mkDerivation { - pname = "js_of_ocaml-lwt"; +buildDunePackage { + pname = "js_of_ocaml-lwt"; - inherit (js_of_ocaml-compiler) version src installPhase meta; + inherit (js_of_ocaml-compiler) version src meta useDune2; - buildInputs = [ ocaml findlib dune_2 js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; + buildInputs = [ js_of_ocaml-ppx ]; - propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ]; - - buildPhase = "dune build -p js_of_ocaml-lwt"; + propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix index 50bcd69eb66a3..6abb1ac1b3ae1 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix @@ -1,15 +1,11 @@ -{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler +{ buildDunePackage, js_of_ocaml-compiler , ocamlbuild }: -stdenv.mkDerivation { - pname = "js_of_ocaml-ocamlbuild"; +buildDunePackage { + pname = "js_of_ocaml-ocamlbuild"; - inherit (js_of_ocaml-compiler) version src installPhase meta; + inherit (js_of_ocaml-compiler) version src meta useDune2; - buildInputs = [ ocaml findlib dune_2 ]; - - propagatedBuildInputs = [ ocamlbuild ]; - - buildPhase = "dune build -p js_of_ocaml-ocamlbuild"; + propagatedBuildInputs = [ ocamlbuild ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix index 69783c7eada1a..b29ef435e46cd 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix @@ -1,14 +1,12 @@ -{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler -, ocaml-migrate-parsetree, ppx_tools_versioned +{ buildDunePackage, js_of_ocaml-compiler +, ppxlib , js_of_ocaml }: -stdenv.mkDerivation { - pname = "js_of_ocaml-ppx"; +buildDunePackage { + pname = "js_of_ocaml-ppx"; - inherit (js_of_ocaml-compiler) version src installPhase meta; + inherit (js_of_ocaml-compiler) version src meta useDune2; - buildInputs = [ ocaml findlib dune_2 ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ]; - - buildPhase = "dune build -p js_of_ocaml-ppx"; + buildInputs = [ ppxlib js_of_ocaml ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix index d3cc4e08787f9..d862d4bc67b78 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -1,15 +1,11 @@ -{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler +{ buildDunePackage, js_of_ocaml-compiler , js_of_ocaml, ppxlib }: -stdenv.mkDerivation { - pname = "js_of_ocaml-ppx_deriving_json"; +buildDunePackage { + pname = "js_of_ocaml-ppx_deriving_json"; - inherit (js_of_ocaml-compiler) version src installPhase meta; + inherit (js_of_ocaml-compiler) version src meta useDune2; - buildInputs = [ ocaml findlib dune_2 ]; - - propagatedBuildInputs = [ js_of_ocaml ppxlib ]; - - buildPhase = "dune build -p js_of_ocaml-ppx_deriving_json"; + propagatedBuildInputs = [ js_of_ocaml ppxlib ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix index fcfeeaf8d99ab..7082e4b86c975 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -1,16 +1,14 @@ -{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler -, js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned +{ buildDunePackage, js_of_ocaml-compiler +, js_of_ocaml-ppx , js_of_ocaml, reactivedata, tyxml }: -stdenv.mkDerivation { - pname = "js_of_ocaml-tyxml"; +buildDunePackage { + pname = "js_of_ocaml-tyxml"; - inherit (js_of_ocaml-compiler) version src installPhase meta; + inherit (js_of_ocaml-compiler) version src meta useDune2; - buildInputs = [ ocaml findlib dune_2 js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; + buildInputs = [ js_of_ocaml-ppx ]; - propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ]; - - buildPhase = "dune build -p js_of_ocaml-tyxml"; + propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ]; } diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 59c77f6e142ab..8fac26c2b3e83 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchzip, ocamlPackages +{ lib, fetchurl, fetchzip, ocaml-ng , version , tarballName ? "ocamlformat-${version}.tbz", }: @@ -22,6 +22,12 @@ let src = } ; in +let ocamlPackages = + if lib.versionAtLeast version "0.14.3" + then ocaml-ng.ocamlPackages + else ocaml-ng.ocamlPackages_4_07 +; in + with ocamlPackages; buildDunePackage rec { diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index b44f50a37ad83..8570e10a07c3d 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packer"; - version = "1.6.5"; + version = "1.6.6"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-M4PZnqdU5+w/B821cs1bJYzeilqdZ93fh5PErVgqBOQ="; + sha256 = "sha256-kFDy8Zlx+D5JDyNlAmB/ICTe4K9s6KDbALP5pom5OQg="; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/packet-sd/default.nix b/pkgs/development/tools/packet-sd/default.nix index 33d61eca718ae..0008fab7442eb 100644 --- a/pkgs/development/tools/packet-sd/default.nix +++ b/pkgs/development/tools/packet-sd/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { description = "Prometheus service discovery for Equinix Metal"; homepage = "https://github.com/packethost/prometheus-packet-sd"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.andir ]; }; } diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix index dbee7631fe002..4f65d5fa5db30 100644 --- a/pkgs/development/tools/pandoc/default.nix +++ b/pkgs/development/tools/pandoc/default.nix @@ -8,30 +8,6 @@ in configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ]; - patches = (drv.patches or []) ++ [ - # Add xmlns to top-level tags in Docbook, required for nixpkgs manual. - # https://github.com/jgm/pandoc/pull/6923 - (fetchpatch { - url = "https://github.com/jgm/pandoc/commit/6f35600204132c5a0907bb7cccb2e10ffb27506a.patch"; - sha256 = "gRUqc4YG4lZdCZn21fPmlcrFyZ3/VlDx71lU8GMuGSs="; - }) - # Generate admonitions in DocBook, required for nixpkgs manual. - # https://github.com/jgm/pandoc/pull/6922 - (fetchpatch { - url = "https://github.com/jgm/pandoc/commit/dc6856530c2cb6ca58ed82721ab895b86cfe0c1c.patch"; - sha256 = "EdsUDlHzsfRscXBR4EP2Z5ZEz+NfrmFHnV7c1hJczio="; - }) - # Use correct id attributes in DocBook, required for nixpkgs manual. - (fetchpatch { - url = "https://github.com/jgm/pandoc/commit/16ef87745702f69d5aa948fbe6d2101577dee8f4.patch"; - sha256 = "WyWTqrO6hGsMgJ7o7QL1BNvhkm0yIO1XJOcfPBDy6ag="; - }) - # Allow using admonition titles from Markdown in DocBook. - (fetchpatch { - url = "https://github.com/jgm/pandoc/commit/70c7c5703afcbd1cbf2a80c2be515e038abcd419.patch"; - sha256 = "2kHQ1qy/UdDi/chwCBvMjAPA/XFH42vWFCjR46Jgt6M="; - }) - ]; })).overrideAttrs (drv: { # These libraries are still referenced, because they generate diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index e343506156363..57c12cce93eaf 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -2,10 +2,12 @@ , fetchgit, fetchFromGitHub, fetchurl , writeShellScript, runCommand, which , rustPlatform, jq, nix-prefetch-git, xe, curl, emscripten +, Security , callPackage + , enableShared ? true , enableStatic ? false -, Security +, webUISupport ? false }: # TODO: move to carnix or https://github.com/kolloch/crate2nix @@ -41,8 +43,10 @@ let builtGrammars = let change = name: grammar: - callPackage ./library.nix { - language = name; inherit version; source = fetchGrammar grammar; + callPackage ./library.nix {} { + language = name; + inherit version; + source = fetchGrammar grammar; }; in # typescript doesn't have parser.c in the same place as others @@ -52,24 +56,25 @@ in rustPlatform.buildRustPackage { pname = "tree-sitter"; inherit src version cargoSha256; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - - nativeBuildInputs = [ emscripten which ]; - - postPatch = '' - # needed for the tests - rm -rf test/fixtures/grammars - ln -s ${grammars} test/fixtures/grammars - - # These functions do not appear in the source code - sed -i /_ts_query_context/d lib/binding_web/exports.json - sed -i /___assert_fail/d lib/binding_web/exports.json + buildInputs = + lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = + [ which ] + ++ lib.optionals webUISupport [ emscripten ]; + + postPatch = lib.optionalString (!webUISupport) '' + # remove web interface + sed -e '/pub mod web_ui/d' \ + -i cli/src/lib.rs + sed -e 's/web_ui,//' \ + -e 's/web_ui::serve(¤t_dir.*$/println!("ERROR: web-ui is not available in this nixpkgs build; enable the webUISupport"); std::process::exit(1);/' \ + -i cli/src/main.rs ''; # Compile web assembly with emscripten. The --debug flag prevents us from # minifying the JavaScript; passing it allows us to side-step more Node # JS dependencies for installation. - preBuild = '' + preBuild = lib.optionalString webUISupport '' bash ./script/build-wasm --debug ''; diff --git a/pkgs/development/tools/parsing/tree-sitter/library.nix b/pkgs/development/tools/parsing/tree-sitter/library.nix index 36245ff7d449c..f78939b22ff9c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/library.nix +++ b/pkgs/development/tools/parsing/tree-sitter/library.nix @@ -1,7 +1,15 @@ { stdenv -, language , tree-sitter +}: + +# Build a parser grammar and put the resulting shared object in `$out/parser` + +{ + # language name + language + # version of tree-sitter , version + # source for the language grammar , source }: diff --git a/pkgs/development/tools/purescript/spago/default.nix b/pkgs/development/tools/purescript/spago/default.nix index f5720837d79ed..62e85a874875e 100644 --- a/pkgs/development/tools/purescript/spago/default.nix +++ b/pkgs/development/tools/purescript/spago/default.nix @@ -1,6 +1,9 @@ { haskell , haskellPackages , lib + +# The following are only needed for the passthru.tests: +, git , nodejs , purescript , runCommand @@ -32,6 +35,7 @@ spago.overrideAttrs (oldAttrs: { { __noChroot = true; nativeBuildInputs = [ + git nodejs purescript spago diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index 4a5ad361e9fd2..43f8e66d8704b 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -1,21 +1,22 @@ { mkDerivation, aeson, aeson-pretty, ansi-terminal, async-pool , base, bower-json, bytestring, Cabal, containers, dhall, directory , either, exceptions, extra, fetchgit, file-embed, filepath, foldl -, fsnotify, github, Glob, hpack, hspec, hspec-discover -, hspec-megaparsec, http-client, http-conduit, http-types -, lens-family-core, megaparsec, mtl, network-uri, open-browser -, optparse-applicative, prettyprinter, process, QuickCheck, retry -, rio, rio-orphans, safe, semver-range, stdenv, stm, tar -, template-haskell, temporary, text, time, transformers, turtle -, unliftio, unordered-containers, vector, versions, with-utf8, zlib +, fsnotify, generic-lens, github, Glob, hpack, hspec +, hspec-discover, hspec-megaparsec, http-client, http-conduit +, http-types, lens-family-core, megaparsec, mtl, network-uri +, open-browser, optparse-applicative, prettyprinter, process +, QuickCheck, retry, rio, rio-orphans, safe, semver-range, stdenv +, stm, stringsearch, tar, template-haskell, temporary, text, time +, transformers, turtle, unliftio, unordered-containers, utf8-string +, vector, versions, with-utf8, zlib }: mkDerivation { pname = "spago"; - version = "0.17.0"; + version = "0.18.0"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "1w9y1gvk307f92gixs5g02zbg0xwhrshwmc5j97pxhbzzg9qjidy"; - rev = "3309afdef25e3e77f991a079eed78ff2f750e463"; + sha256 = "03ww7qhrggwsbm0kcnvcr3ifb8rm860ajimzr81isiw46ykwrl38"; + rev = "a4d39c21cae2f2c6d43fa204853c8e17c72904d2"; fetchSubmodules = true; }; isLibrary = true; @@ -23,12 +24,12 @@ mkDerivation { libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async-pool base bower-json bytestring Cabal containers dhall directory either exceptions - file-embed filepath foldl fsnotify github Glob http-client - http-conduit http-types lens-family-core megaparsec mtl network-uri - open-browser optparse-applicative prettyprinter process retry rio - rio-orphans safe semver-range stm tar template-haskell temporary - text time transformers turtle unliftio unordered-containers vector - versions with-utf8 zlib + file-embed filepath foldl fsnotify generic-lens github Glob + http-client http-conduit http-types lens-family-core megaparsec mtl + network-uri open-browser optparse-applicative prettyprinter process + retry rio rio-orphans safe semver-range stm stringsearch tar + template-haskell temporary text time transformers turtle unliftio + unordered-containers utf8-string vector versions with-utf8 zlib ]; libraryToolDepends = [ hpack ]; executableHaskellDepends = [ base text turtle with-utf8 ]; diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index 8f75540f3a617..cb9b4f950c929 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -1,18 +1,18 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage { +buildGoModule rec { pname = "quicktemplate"; - version = "unstable-2019-07-08"; - goPackagePath = "github.com/valyala/quicktemplate"; - goDeps = ./deps.nix; + version = "1.6.3"; src = fetchFromGitHub { owner = "valyala"; repo = "quicktemplate"; - rev = "840e9171940bbc80bb1b925c880664cababae022"; - sha256 = "1pimf5bwivklsr438if6l8by34gr48a05gl6hq07cvc8z6wl01m2"; + rev = "v${version}"; + sha256 = "mQhrQcKRDtcXha7FIwCIUwWfoPGIJ5YLbA4HdatIdn8="; }; + vendorSha256 = null; + meta = with stdenv.lib; { homepage = "https://github.com/valyala/quicktemplate"; description = "Fast, powerful, yet easy to use template engine for Go"; diff --git a/pkgs/development/tools/quicktemplate/deps.nix b/pkgs/development/tools/quicktemplate/deps.nix deleted file mode 100644 index 6c042966c23f4..0000000000000 --- a/pkgs/development/tools/quicktemplate/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/valyala/bytebufferpool"; - fetch = { - type = "git"; - url = "https://github.com/valyala/bytebufferpool"; - rev = "cdfbe9377474227bb42120c1e22fd4433e7f69bf"; - sha256 = "0c6cixd85dvl2gvs7sdh0k2wm8r3grl4fw0jg4w7d78cp8s2k7ag"; - }; - } -] diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix index f535fa055ed0c..48ceea24b70c1 100644 --- a/pkgs/development/tools/statik/default.nix +++ b/pkgs/development/tools/statik/default.nix @@ -1,18 +1,26 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage { +buildGoModule rec { pname = "statik"; - version = "unstable-2019-07-31"; - goPackagePath = "github.com/rakyll/statik"; + version = "0.1.7"; src = fetchFromGitHub { owner = "rakyll"; repo = "statik"; - rev = "925a23bda946b50bb0804894f340c5da2b95603b"; - sha256 = "15wwgrprfq36pa13b9anp7097q1fqcad28hirvivybmc011p0fri"; + rev = "v${version}"; + sha256 = "ahsNiac/3I2+PUqc90E73Brb99M68ewh9nWXoupfE3g="; }; - meta = with stdenv.lib; { + vendorSha256 = "pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + # Avoid building example + subPackages = [ "." "fs" ]; + # Tests are checking that the files embeded are preserving + # their meta data like dates etc, but it assumes to be in 2048 + # which is not the case once entered the nix store + doCheck = false; + + meta = with lib; { homepage = "https://github.com/rakyll/statik"; description = "Embed files into a Go executable "; license = licenses.asl20; diff --git a/pkgs/development/tools/wally-cli/default.nix b/pkgs/development/tools/wally-cli/default.nix index ffa6664685956..4c843d04b8cf1 100644 --- a/pkgs/development/tools/wally-cli/default.nix +++ b/pkgs/development/tools/wally-cli/default.nix @@ -4,7 +4,6 @@ buildGoModule rec { pname = "wally-cli"; version = "2.0.0"; - goPackagePath = "github.com/zsa/wally-cli"; subPackages = [ "." ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock b/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock index eed61d4ec143c..289bb631c1206 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock +++ b/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock @@ -15,9 +15,9 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "aho-corasick" -version = "0.7.13" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" dependencies = [ "memchr", ] @@ -33,9 +33,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.32" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b" +checksum = "2c0df63cb2955042487fad3aefd2c6e3ae7389ac5dc1beb28921de0b69f779d4" [[package]] name = "arrayref" @@ -45,9 +45,9 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" [[package]] name = "arrayvec" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "ascii" @@ -57,9 +57,9 @@ checksum = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14" [[package]] name = "askama" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a6e7ebd44d0047fd48206c83c5cd3214acc7b9d87f001da170145c47ef7d12" +checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134" dependencies = [ "askama_derive", "askama_escape", @@ -68,13 +68,12 @@ dependencies = [ [[package]] name = "askama_derive" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d7169690c4f56343dcd821ab834972a22570a2662a19a84fd7775d5e1c3881" +checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522" dependencies = [ "askama_shared", "proc-macro2", - "quote", "syn", ] @@ -86,14 +85,14 @@ checksum = "90c108c1a94380c89d2215d0ac54ce09796823cca0fd91b299cfff3b33e346fb" [[package]] name = "askama_shared" -version = "0.10.4" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62fc272363345c8cdc030e4c259d9d028237f8b057dc9bb327772a257bde6bb5" +checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc" dependencies = [ "askama_escape", "humansize", - "nom", - "num-traits 0.2.12", + "nom 6.0.1", + "num-traits 0.2.14", "percent-encoding 2.1.0", "proc-macro2", "quote", @@ -104,9 +103,9 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c88b9ca26f9c16ec830350d309397e74ee9abdfd8eb1f71cb6ecc71a3fc818da" +checksum = "3dc1679af9a1ab4bea16f228b05d18f8363f8327b1fa8db00d2760cfafc6b61e" dependencies = [ "doc-comment", "predicates", @@ -134,9 +133,9 @@ checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" [[package]] name = "autocfg" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "base64" @@ -150,9 +149,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bitflags" @@ -167,10 +166,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] +name = "bitvec" +version = "0.19.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] name = "blake2b_simd" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" +checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" dependencies = [ "arrayref", "arrayvec", @@ -210,9 +221,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.58" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" +checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" [[package]] name = "cfg-if" @@ -221,6 +232,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] name = "char" version = "0.1.0" dependencies = [ @@ -229,13 +246,15 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.13" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" dependencies = [ + "libc", "num-integer", - "num-traits 0.2.12", + "num-traits 0.2.14", "time", + "winapi", ] [[package]] @@ -246,9 +265,9 @@ checksum = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87" [[package]] name = "clap" -version = "2.33.1" +version = "2.33.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ "ansi_term", "atty", @@ -279,9 +298,9 @@ dependencies = [ [[package]] name = "color_quant" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "console_error_panic_hook" @@ -289,7 +308,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "wasm-bindgen", ] @@ -302,64 +321,68 @@ dependencies = [ ] [[package]] +name = "const_fn" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826" + +[[package]] name = "constant_time_eq" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] -name = "crossbeam-deque" -version = "0.7.3" +name = "crossbeam-channel" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" +checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" dependencies = [ - "crossbeam-epoch", + "cfg-if 1.0.0", "crossbeam-utils", - "maybe-uninit", ] [[package]] -name = "crossbeam-epoch" -version = "0.8.2" +name = "crossbeam-deque" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" dependencies = [ - "autocfg 1.0.0", - "cfg-if", + "cfg-if 1.0.0", + "crossbeam-epoch", "crossbeam-utils", - "lazy_static", - "maybe-uninit", - "memoffset", - "scopeguard", ] [[package]] -name = "crossbeam-queue" -version = "0.2.3" +name = "crossbeam-epoch" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" +checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", + "const_fn", "crossbeam-utils", - "maybe-uninit", + "lazy_static", + "memoffset", + "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.7.2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" dependencies = [ - "autocfg 1.0.0", - "cfg-if", + "autocfg 1.0.1", + "cfg-if 1.0.0", "lazy_static", ] [[package]] name = "curl" -version = "0.4.31" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9447ad28eee2a5cfb031c329d46bef77487244fff6a724b378885b8691a35f78" +checksum = "e268162af1a5fe89917ae25ba3b0a77c8da752bdc58e7dbb4f15b91fbd33756e" dependencies = [ "curl-sys", "libc", @@ -372,9 +395,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.33+curl-7.71.1" +version = "0.4.39+curl-7.74.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9818ea018327f79c811612f29b9834d2abddbe7db81460a2d5c7e12946b337" +checksum = "07a8ce861e7b68a0b394e814d7ee9f1b2750ff8bd10372c6ad3bacc10e86f874" dependencies = [ "cc", "libc", @@ -453,9 +476,9 @@ dependencies = [ [[package]] name = "either" -version = "1.5.3" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "enum_primitive" @@ -468,12 +491,12 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.7.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "f26ecb66b4bdca6c1409b40fb255eefc2bd4f6d135dab3c3124f80ffa2a9661e" dependencies = [ "atty", - "humantime 1.3.0", + "humantime", "log 0.4.11", "regex", "termcolor", @@ -493,11 +516,11 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e500da2fab70bdc43f8f0e0b350a227f31c72311c56aba48f01d5cd62bb0345b" +checksum = "0c122a393ea57648015bf06fbd3d372378992e86b9ff5a7a497b076a28c79efe" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "redox_syscall", "winapi", @@ -509,7 +532,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" dependencies = [ - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -534,10 +557,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] +name = "funty" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ba62103ce691c2fd80fbae2213dfdda9ce60804973ac6b6e97de818ea7f52c8" + +[[package]] name = "futures" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613" +checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0" dependencies = [ "futures-channel", "futures-core", @@ -550,9 +579,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" +checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64" dependencies = [ "futures-core", "futures-sink", @@ -569,9 +598,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399" +checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748" [[package]] name = "futures-core-preview" @@ -581,9 +610,9 @@ checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" [[package]] name = "futures-executor" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314" +checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65" dependencies = [ "futures-core", "futures-task", @@ -592,15 +621,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789" +checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb" [[package]] name = "futures-macro" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" +checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556" dependencies = [ "proc-macro-hack", "proc-macro2", @@ -610,24 +639,24 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" +checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d" [[package]] name = "futures-task" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" +checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d" dependencies = [ "once_cell", ] [[package]] name = "futures-util" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" +checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2" dependencies = [ "futures-channel", "futures-core", @@ -645,13 +674,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", - "wasi", + "wasi 0.9.0+wasi-snapshot-preview1", ] [[package]] @@ -695,9 +724,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" dependencies = [ "libc", ] @@ -716,15 +745,6 @@ checksum = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e" [[package]] name = "humantime" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] - -[[package]] -name = "humantime" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" @@ -797,7 +817,7 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.44" +version = "0.3.46" dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", @@ -825,16 +845,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" [[package]] +name = "lexical-core" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" +dependencies = [ + "arrayvec", + "bitflags 1.2.1", + "cfg-if 0.1.10", + "ryu", + "static_assertions", +] + +[[package]] name = "libc" -version = "0.2.74" +version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10" +checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" [[package]] name = "libz-sys" -version = "1.0.25" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" +checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655" dependencies = [ "cc", "libc", @@ -857,7 +890,7 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -873,24 +906,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" [[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] name = "memchr" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] name = "memoffset" -version = "0.5.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" +checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", ] [[package]] @@ -950,6 +977,18 @@ dependencies = [ ] [[package]] +name = "nom" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88034cfd6b4a0d54dd14f4a507eceee36c0b70e5a02236c4e4df571102be17f0" +dependencies = [ + "bitvec", + "lexical-core", + "memchr", + "version_check 0.9.2", +] + +[[package]] name = "normalize-line-endings" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -957,23 +996,23 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "num-integer" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ - "autocfg 1.0.0", - "num-traits 0.2.12", + "autocfg 1.0.1", + "num-traits 0.2.14", ] [[package]] name = "num-iter" -version = "0.1.41" +version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" +checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", "num-integer", - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -983,7 +1022,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" dependencies = [ "num-integer", - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -992,16 +1031,16 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] name = "num-traits" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", ] [[package]] @@ -1016,18 +1055,18 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.4.0" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" +checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" [[package]] name = "openssl" -version = "0.10.30" +version = "0.10.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" +checksum = "8d008f51b1acffa0d3450a68606e6a51c123012edaacb0f4e1426bd978869187" dependencies = [ "bitflags 1.2.1", - "cfg-if", + "cfg-if 1.0.0", "foreign-types", "lazy_static", "libc", @@ -1042,20 +1081,20 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" [[package]] name = "openssl-src" -version = "111.10.2+1.1.1g" +version = "111.13.0+1.1.1i" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a287fdb22e32b5b60624d4a5a7a02dbe82777f730ec0dbc42a0554326fef5a70" +checksum = "045e4dc48af57aad93d665885789b43222ae26f4886494da12d1ed58d309dcb6" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.58" +version = "0.9.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" +checksum = "de52d8eabd217311538a39bba130d7dea1f1e118010fee7a033d966845e7d5fe" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", "cc", "libc", "openssl-src", @@ -1079,7 +1118,7 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" name = "performance" version = "0.1.0" dependencies = [ - "humantime 2.0.1", + "humantime", "wasm-bindgen", "web-sys", ] @@ -1125,18 +1164,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.23" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa" +checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "0.4.23" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f" +checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f" dependencies = [ "proc-macro2", "quote", @@ -1151,9 +1190,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" +checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" [[package]] name = "png" @@ -1169,9 +1208,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "predicates" @@ -1204,9 +1243,9 @@ dependencies = [ [[package]] name = "proc-macro-error" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", "proc-macro2", @@ -1217,22 +1256,20 @@ dependencies = [ [[package]] name = "proc-macro-error-attr" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2", "quote", - "syn", - "syn-mid", "version_check 0.9.2", ] [[package]] name = "proc-macro-hack" -version = "0.5.18" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" @@ -1242,9 +1279,9 @@ checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" [[package]] name = "proc-macro2" -version = "1.0.19" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" dependencies = [ "unicode-xid", ] @@ -1265,6 +1302,12 @@ dependencies = [ ] [[package]] +name = "radium" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" + +[[package]] name = "rand" version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1439,11 +1482,11 @@ dependencies = [ [[package]] name = "rayon" -version = "1.3.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080" +checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", "crossbeam-deque", "either", "rayon-core", @@ -1451,12 +1494,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.7.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280" +checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" dependencies = [ + "crossbeam-channel", "crossbeam-deque", - "crossbeam-queue", "crossbeam-utils", "lazy_static", "num_cpus", @@ -1504,9 +1547,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_users" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" +checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" dependencies = [ "getrandom", "redox_syscall", @@ -1515,9 +1558,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.3.9" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" dependencies = [ "aho-corasick", "memchr", @@ -1527,9 +1570,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.18" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" +checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" [[package]] name = "remove_dir_all" @@ -1573,11 +1616,11 @@ dependencies = [ [[package]] name = "rust-argon2" -version = "0.7.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" +checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" dependencies = [ - "base64 0.11.0", + "base64 0.13.0", "blake2b_simd", "constant_time_eq", "crossbeam-utils", @@ -1592,9 +1635,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.16" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" +checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" [[package]] name = "ryu" @@ -1648,18 +1691,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.114" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" +checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.114" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" +checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" dependencies = [ "proc-macro2", "quote", @@ -1668,9 +1711,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.57" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" +checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779" dependencies = [ "itoa", "ryu", @@ -1697,11 +1740,11 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" [[package]] name = "socket2" -version = "0.3.12" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" +checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "redox_syscall", "winapi", @@ -1714,6 +1757,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" [[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] name = "strsim" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1727,9 +1776,9 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" [[package]] name = "structopt" -version = "0.3.15" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c" +checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" dependencies = [ "clap", "lazy_static", @@ -1738,9 +1787,9 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.8" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118" +checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" dependencies = [ "heck", "proc-macro-error", @@ -1751,9 +1800,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.36" +version = "1.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cdb98bcb1f9d81d07b536179c269ea15999b5d14ea958196413869445bb5250" +checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44" dependencies = [ "proc-macro2", "quote", @@ -1761,15 +1810,10 @@ dependencies = [ ] [[package]] -name = "syn-mid" -version = "0.5.0" +name = "tap" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e" [[package]] name = "tempdir" @@ -1787,7 +1831,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "rand 0.7.3", "redox_syscall", @@ -1808,9 +1852,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" dependencies = [ "winapi-util", ] @@ -1844,11 +1888,12 @@ dependencies = [ [[package]] name = "time" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi", ] @@ -1867,9 +1912,18 @@ dependencies = [ [[package]] name = "tinyvec" -version = "0.3.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" +checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "todomvc" @@ -1884,9 +1938,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645" dependencies = [ "serde", ] @@ -1899,9 +1953,9 @@ checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" [[package]] name = "trybuild" -version = "1.0.31" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a4d94e6adf00b96b1ab94fcfcd8c3cf916733b39adf90c8f72693629887b9b8" +checksum = "18ccca2bc5e97a2688cba15c573d5179cdff976fc597b95472c2e0f443492b98" dependencies = [ "glob", "lazy_static", @@ -1949,18 +2003,18 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.13" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" +checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" +checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" [[package]] name = "unicode-width" @@ -1987,9 +2041,9 @@ dependencies = [ [[package]] name = "vcpkg" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" +checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" [[package]] name = "vec_map" @@ -2052,10 +2106,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] name = "wasm-bindgen" -version = "0.2.67" +version = "0.2.69" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "js-sys", "serde", "serde_derive", @@ -2069,7 +2129,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.67" +version = "0.2.69" dependencies = [ "bumpalo", "lazy_static", @@ -2090,7 +2150,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli" -version = "0.2.67" +version = "0.2.69" dependencies = [ "anyhow", "assert_cmd", @@ -2118,7 +2178,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli-support" -version = "0.2.67" +version = "0.2.69" dependencies = [ "anyhow", "base64 0.9.3", @@ -2140,21 +2200,21 @@ dependencies = [ [[package]] name = "wasm-bindgen-externref-xform" -version = "0.2.67" +version = "0.2.69" dependencies = [ "anyhow", "rayon", "walrus", "wasmprinter", - "wast", + "wast 21.0.0", "wat", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.17" +version = "0.4.19" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "futures-channel-preview", "js-sys", "wasm-bindgen", @@ -2164,7 +2224,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.67" +version = "0.2.69" dependencies = [ "quote", "trybuild", @@ -2175,7 +2235,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.67" +version = "0.2.69" dependencies = [ "proc-macro2", "quote", @@ -2186,13 +2246,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-multi-value-xform" -version = "0.2.67" +version = "0.2.69" dependencies = [ "anyhow", "rayon", "walrus", "wasmprinter", - "wast", + "wast 21.0.0", "wat", ] @@ -2207,11 +2267,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.67" +version = "0.2.69" [[package]] name = "wasm-bindgen-test" -version = "0.3.17" +version = "0.3.19" dependencies = [ "console_error_panic_hook", "js-sys", @@ -2237,7 +2297,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.17" +version = "0.3.19" dependencies = [ "proc-macro2", "quote", @@ -2245,7 +2305,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-threads-xform" -version = "0.2.67" +version = "0.2.69" dependencies = [ "anyhow", "walrus", @@ -2254,7 +2314,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-conventions" -version = "0.2.67" +version = "0.2.69" dependencies = [ "anyhow", "walrus", @@ -2262,7 +2322,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-interpreter" -version = "0.2.67" +version = "0.2.69" dependencies = [ "anyhow", "log 0.4.11", @@ -2274,7 +2334,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-webidl" -version = "0.2.67" +version = "0.2.69" dependencies = [ "anyhow", "env_logger", @@ -2323,18 +2383,18 @@ checksum = "a950e6a618f62147fd514ff445b2a0b53120d382751960797f85f058c7eda9b9" [[package]] name = "wasmparser" -version = "0.60.2" +version = "0.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d5790a08f11f3d6b5767f6c49152df74b215e3dc5a38147713c4f6a05aac7f" +checksum = "89a30c99437829ede826802bfcf28500cf58df00e66cb9114df98813bc145ff1" [[package]] name = "wasmprinter" -version = "0.2.7" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc836dba85dd00df43d71b22063bcb367d324aa1be0d046077cc7fca4c43876" +checksum = "0515db67c610037f3c53ec36976edfd1eb01bac6b1226914b17ce609480e729f" dependencies = [ "anyhow", - "wasmparser 0.60.2", + "wasmparser 0.71.0", ] [[package]] @@ -2347,17 +2407,26 @@ dependencies = [ ] [[package]] +name = "wast" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b79907b22f740634810e882d8d1d9d0f9563095a8ab94e786e370242bff5cd2" +dependencies = [ + "leb128", +] + +[[package]] name = "wat" -version = "1.0.22" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce85d72b74242c340e9e3492cfb602652d7bb324c3172dd441b5577e39a2e18c" +checksum = "a8279a02835bf12e61ed2b3c3cbc6ecf9918762fd97e036917c11a09ec20ca44" dependencies = [ - "wast", + "wast 30.0.0", ] [[package]] name = "web-sys" -version = "0.3.44" +version = "0.3.46" dependencies = [ "js-sys", "wasm-bindgen", @@ -2388,6 +2457,7 @@ version = "0.1.0" dependencies = [ "js-sys", "wasm-bindgen", + "wasm-bindgen-futures", "wasm-bindgen-test", "wasm-bindgen-webidl", ] @@ -2430,7 +2500,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a7d4f9feb723a800d8f7b74edc9fa44ff35cb0b2ec64886714362f423427f37" dependencies = [ - "nom", + "nom 5.1.2", ] [[package]] @@ -2500,7 +2570,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33358e95c77d660f1c7c07f4a93c2bd89768965e844e3c50730bb4b42658df5f" dependencies = [ "anyhow", - "wast", + "wast 21.0.0", "wit-writer", ] @@ -2555,3 +2625,9 @@ dependencies = [ "wasm-bindgen", "web-sys", ] + +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index 0863905e932bc..5794f5cc335eb 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -4,7 +4,7 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.67"; + version = "0.2.69"; src = let @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - sha256 = "0qx178aicbn59b150j5r78zya5n0yljvw4c4lhvg8x4cpfshjb5j"; + sha256 = "1psylk3hlx0ahwib3ph8qdk0jwlp8qzc6dv61002rj7ns28vs4mx"; }; in runCommand "source" { } '' cp -R ${tarball} $out @@ -23,14 +23,14 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkgconfig ]; - cargoSha256 = "0chpw6syqxn824cbkdjx1s26vmajx511gc4mp9y64vy7b7asba6x"; + cargoSha256 = "1wrfly7c3an1mjqm7v13mlvx57hwlcxfjijkimicck04q6qdhbp6"; cargoBuildFlags = [ "-p" pname ]; meta = with lib; { homepage = "https://rustwasm.github.io/docs/wasm-bindgen/"; license = licenses.asl20; description = "Facilitating high-level interactions between wasm modules and JavaScript"; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ma27 rizary ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index b7020eacdc32c..6b85e20612bfe 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "1w0j6if1fnih1036hlb9a3c6wgjw4p057llhjf0f3d568ah1244a"; + sha256 = "1h9020yf5jsbilzn94h7qyxw9qnz3vw43g8a2415wvjqq6ihzfvm"; }; - cargoSha256 = "0d9wvdjjakznz8dnqx4gqxh0xkxrh4229460hg6dr9qn492p7nfx"; + cargoSha256 = "12azc41y2yx936ax9b1yylc0gy91k0m7ih6p0bkw7m928f762hpx"; nativeBuildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix index 94237abf89b7f..43771e4b67985 100644 --- a/pkgs/development/tools/yj/default.nix +++ b/pkgs/development/tools/yj/default.nix @@ -1,27 +1,24 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "yj"; - version = "4.0.0"; - rev = "d9a48607cc5c812e8cf4abccc8ad26f37ab51558"; + version = "5.0.0"; - goPackagePath = "github.com/sclevine/yj"; - - src = fetchgit { - inherit rev; - url = "https://github.com/sclevine/yj"; - sha256 = "04irphzs6hp9hvyski29ad29ga1kis3h8bw7jqvmy2c2rkrrsh7x"; + src = fetchFromGitHub { + owner = "sclevine"; + repo = "yj"; + rev = "c4c13b7641389c76ea028b48091f851f3efb6376"; + sha256 = "0bnb88wfm2vagh4yb1h9xhp3045ga0b6a77n3j2z5b4mvwshx5dr"; }; - goDeps = ./deps.nix; + vendorSha256 = "0y0n9fsb85qlpf9slwsxzarmfi98asa4x04qp2r8pagl28l0i8wv"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; meta = with stdenv.lib; { description = ''Convert YAML <=> TOML <=> JSON <=> HCL''; license = licenses.asl20; maintainers = with maintainers; [ Profpatsch ]; - downloadPage = "https://github.com/sclevine/yj"; - updateWalker = true; - inherit version; + homepage = "https://github.com/sclevine/yj"; }; } diff --git a/pkgs/development/tools/yj/deps.nix b/pkgs/development/tools/yj/deps.nix deleted file mode 100644 index 0bfe7f5f5da31..0000000000000 --- a/pkgs/development/tools/yj/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "cf7d376da96d9cecec7c7483cec2735efe54a410"; - sha256 = "0i1zhgpyvvgwkz74k8wd3sygsap1saqv37rw0j5vdpaazmpr1qkb"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index 05410bbaec529..67c8509fd70e2 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -10,8 +10,6 @@ buildGoModule rec { sha256 = "0v9wp15aj4r7wif8i897zwj3c6bg41b95kk7vi3a3bzin814qn6l"; }; - goPackagePath = "github.com/vmware-tanzu/carvel-ytt"; - vendorSha256 = null; subPackages = [ "cmd/ytt" ]; diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix index ffa6fba778a2d..5085346e3eb63 100644 --- a/pkgs/development/web/lucky-cli/default.nix +++ b/pkgs/development/web/lucky-cli/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "lucky-cli"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "luckyframework"; repo = "lucky_cli"; rev = "v${version}"; - sha256 = "1z1ns6lx5v6nd5s78brpx7jarc9aldca5yrqjrdb14iyw0jlxig4"; + sha256 = "sha256-/DKDg2lJO6PikF7+kbwRX8ClS8rflH8KdrZNx7AR36g="; }; # the integration tests will try to clone a remote repos @@ -38,5 +38,6 @@ crystal.buildCrystalPackage rec { license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; + broken = lib.versionOlder crystal.version "0.35.1"; }; } diff --git a/pkgs/development/web/lucky-cli/shard.lock b/pkgs/development/web/lucky-cli/shard.lock index 6564e86624f7a..47c40af8c7df3 100644 --- a/pkgs/development/web/lucky-cli/shard.lock +++ b/pkgs/development/web/lucky-cli/shard.lock @@ -1,5 +1,14 @@ -version: 1.0 +version: 2.0 shards: + ameba: + git: https://github.com/crystal-ameba/ameba.git + version: 0.13.3 + + future: + git: https://github.com/crystal-community/future.cr.git + version: 0.1.0 + teeplate: - github: luckyframework/teeplate - version: 0.8.1 + git: https://github.com/luckyframework/teeplate.git + version: 0.8.2 + diff --git a/pkgs/development/web/lucky-cli/shards.nix b/pkgs/development/web/lucky-cli/shards.nix index 0fa5aec9e06da..2741583b681a2 100644 --- a/pkgs/development/web/lucky-cli/shards.nix +++ b/pkgs/development/web/lucky-cli/shards.nix @@ -1,8 +1,20 @@ { + ameba = { + owner = "crystal-ameba"; + repo = "ameba"; + rev = "v0.13.3"; + sha256 = "0yhb8vfrfzsm3a45h2jmcrn1n7jy3zn2hwims3dikgq8kaggws9y"; + }; + future = { + owner = "crystal-community"; + repo = "future.cr"; + rev = "v0.1.0"; + sha256 = "1p88mfn1ab5hz4r81vjfm1vn9rww0lbbii8lyzfx9pkxanh9rp98"; + }; teeplate = { owner = "luckyframework"; repo = "teeplate"; - rev = "v0.8.1"; - sha256 = "022jmmg3d2wq2xnhc63afldm9vrcr8xqn43s9i39d7qflrzrfc7v"; + rev = "v0.8.2"; + sha256 = "1v7njslcpir52nnyd30mfnxvqmb7ycqnlq80qnx6myw20iy9dcww"; }; } diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index c3e4d7507806a..14833bb042f4c 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.15.1"; - sha256 = "1g61vqsgq3jsipw2fckj68i4a4pi1iz1kbw7mlw8jmzp8rl46q81"; + version = "14.15.3"; + sha256 = "1zplrfhsrqblvq2wxf5386wc9hf11k42jaw4mzgwy5dxx6dv3krj"; patches = stdenv.lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix index 06cb48260cdb8..3569ad3a1024a 100644 --- a/pkgs/development/web/nodejs/v15.nix +++ b/pkgs/development/web/nodejs/v15.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "15.4.0"; - sha256 = "0kp0hckhjkmaqyvjpcj17rj6fw9fg3c95j78r2nr10bc65anjwms"; + version = "15.5.0"; + sha256 = "1wzcypb1kawc6m5q36cd31qjg7ljby8py9qg555m4bqm5gpvvfjg"; } diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix new file mode 100644 index 0000000000000..1a642c90d2ec9 --- /dev/null +++ b/pkgs/games/anki/bin.nix @@ -0,0 +1,64 @@ +{ fetchurl, stdenv, lib, buildFHSUserEnv, appimageTools, writeShellScript, anki, undmg }: + +let + pname = "anki-bin"; + # Update hashes for both Linux and Darwin! + version = "2.1.36"; + + unpacked = stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2"; + sha256 = "01xcjnfs5pfh7v0nkffw2wpl19l6pj9k3kxrcawv3cm42asy0mfz"; + }; + + installPhase = '' + runHook preInstall + + xdg-mime () { + echo Stubbed! + } + export -f xdg-mime + + PREFIX=$out bash install.sh + + runHook postInstall + ''; + }; + + meta = with lib; { + inherit (anki.meta) license homepage description longDescription; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ atemu ]; + }; +in + +if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // { + name = "anki"; + + runScript = writeShellScript "anki-wrapper.sh" '' + # Wayland support is broken, disable via ENV variable + export QT_QPA_PLATFORM=xcb + exec ${unpacked}/bin/anki + ''; + + inherit meta; +}) else stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg"; + sha256 = "1i6iidm5h8r9g801mvqxi2av03qdw3lr28056fv5ixnb5dq2wqim"; + }; + + nativeBuildInputs = [ undmg ]; + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/Applications/ + cp -a Anki.app $out/Applications/ + ''; + + inherit meta; +} diff --git a/pkgs/games/augustus/default.nix b/pkgs/games/augustus/default.nix index cabe419ef5bc6..18c8842e594e8 100644 --- a/pkgs/games/augustus/default.nix +++ b/pkgs/games/augustus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "augustus"; - version = "1.4.1a"; + version = "2.0.1"; src = fetchFromGitHub { owner = "Keriew"; repo = "augustus"; rev = "v${version}"; - sha256 = "1xqv8j8jh3f13fjhyf7hk1anrn799cwwsvsd75kpl9n5yh5s1j5y"; + sha256 = "0czazw8mc3fbvdazs2nzvgxd1dpzjc8z5fwiv89vv4nd7laz3jkj"; }; nativeBuildInputs = [ cmake ]; @@ -17,8 +17,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source re-implementation of Caesar III. Fork of Julius incorporating gameplay changes"; homepage = "https://github.com/Keriew/augustus"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.all; + broken = stdenv.isDarwin; maintainers = with maintainers; [ Thra11 ]; }; } diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index 6da8e1bf9bf80..e0f9ca41c6d0e 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "banner-1.3.4"; + pname = "banner"; + version = "1.3.5"; - src = fetchurl { - url = "http://software.cedar-solutions.com/ftp/software/${name}.tar.gz"; - sha256 = "04q5ribr0r9s8waky3nk356l0qdhfxw15ipz7lsfgv1fxq3qk6bz"; + src = fetchFromGitHub { + owner = "pronovic"; + repo = "banner"; + rev = "BANNER_V${version}"; + sha256 = "ISSnGzrFSzSj/+KxgeFtaw4H+4Ea5x5S5C8xjcjKWqQ="; }; meta = with stdenv.lib; { homepage = "http://software.cedar-solutions.com/utilities.html"; description = "Print large banners to ASCII terminals"; - license = licenses.gpl2; + license = licenses.gpl2Only; longDescription = '' An implementation of the traditional Unix-program used to display diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index e32f2e96d4fa7..a8aef81523d81 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -6,7 +6,7 @@ }: let - version = "2020.1.2"; + version = "2020.3.4"; shortVersion = builtins.substring 0 6 version; data = stdenv.mkDerivation rec { pname = "flightgear-data"; @@ -14,7 +14,7 @@ let src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2"; - sha256 = "0ldsjb54k8nb99h6n4f4x20nawd2pa0a8skkwkrgckdpmdv0zwyk"; + sha256 = "1cqikbqvidfaynml9bhqfr9yw5ga35gpqrbz62z94a1skdijkpkg"; }; phases = [ "installPhase" ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "1770kgwa7z70sx6da9x1q9cszpd3ywz6nn8jrb6xv8ldjqcpqpvb"; + sha256 = "02d9h10p8hyn0a25csragj6pbwmrir1z8zb92023s9vi21j7bwy8"; }; # Of all the files in the source and data archives, there doesn't seem to be diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix index ab5bbe2dd9fb0..3313f156ed282 100644 --- a/pkgs/games/frogatto/data.nix +++ b/pkgs/games/frogatto/data.nix @@ -7,9 +7,9 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "frogatto"; repo = "frogatto"; - # master branch as of 2018-12-18 - rev = "8f261b5d3fca3c88e6a534316a28378cf687d3e5"; - sha256 = "0nyfwfyy5gxp61ydna299nq9p5wra9mk0bf1drdngg6bwws1hrqx"; + # master branch as of 2020-12-17 + rev = "c1d0813b3b755a4e232369b6791397ad058efc16"; + sha256 = "1fhaidd35392zzavp93r6ihyansgkc3m1ilz71ia1zl4n3fbsxjg"; }; installPhase = '' diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix index f6d4789c30b11..ee3803617dcae 100644 --- a/pkgs/games/frogatto/default.nix +++ b/pkgs/games/frogatto/default.nix @@ -14,7 +14,7 @@ let genericName = "frogatto"; categories = "Game;ArcadeGame;"; }; - version = "unstable-2018-12-18"; + version = "unstable-2020-12-04"; in buildEnv { name = "frogatto-${version}"; diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix index d51cfcb8f2052..94c2a038d9204 100644 --- a/pkgs/games/frogatto/engine.nix +++ b/pkgs/games/frogatto/engine.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { owner = "anura-engine"; repo = "anura"; # trunk branch as of 2018-11-28 - rev = "8070111467802dc772c0a6c7806ecd16b0bcdaa9"; - sha256 = "0xbqwfmws69n7iiz17n93h4jiw39cwyf7hxw0qi2c8cccr37b1nr"; + rev = "a05f413f255d2854019134be817c253a03da3d9f"; + sha256 = "1hd57q8gbn1zdpibnqd3ma0z1ycayc2f4r9j4m2m9kc6yf4v7w7b"; fetchSubmodules = true; }; diff --git a/pkgs/games/manaplus/default.nix b/pkgs/games/manaplus/default.nix new file mode 100644 index 0000000000000..ff7bfae971a06 --- /dev/null +++ b/pkgs/games/manaplus/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchurl, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer +, SDL2_net , SDL2_gfx, zlib, physfs, curl, libxml2, libpng, pkg-config +, libGL, autoreconfHook }: +stdenv.mkDerivation rec { + pname = "manaplus"; + version = "1.9.3.23"; + + src = fetchurl { + url = "https://download.evolonline.org/manaplus/download/${version}/manaplus-${version}.tar.xz"; + sha256 = "1ky182p4svwdqm6cf7jbns85hidkhkhq4s17cs2p381f0klapfjz"; + }; + + nativeBuildInputs = [ + autoreconfHook pkg-config + ]; + + buildInputs = [ + SDL2 SDL2_image SDL2_ttf SDL2_mixer SDL2_net SDL2_gfx zlib + physfs curl libxml2 libpng libGL + ]; + + configureFlags = [ "--with-sdl2" "--without-dyecmd" ]; + + enableParallelBuilding = true; + + meta = { + maintainers = [ lib.maintainers.lheckemann ]; + description = "A free OpenSource 2D MMORPG client"; + homepage = "https://manaplus.org/"; + license = lib.licenses.gpl2; + }; +} diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 89ff37458af95..423bf4bf9fe05 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -22,14 +22,14 @@ let # Note: when raising the version, ensure that all SNAPSHOT versions in # build.gradle are replaced by a fixed version # (the current one at the time of release) (see postPatch). - version = "120.2"; + version = "122"; buildVersion = makeBuildVersion version; src = fetchFromGitHub { owner = "Anuken"; repo = "Mindustry"; rev = "v${version}"; - sha256 = "01a7qpwfr1n540fk0k65kl03biix0gmg66z7qn22mb2703laq1xc"; + sha256 = "19dxqscnny0c5w3pyg88hflrkhsqgd7zx19240kh4h69y3wwaz0m"; }; desktopItem = makeDesktopItem { @@ -50,6 +50,13 @@ let sed -i 's/com.github.anuken:packr:-SNAPSHOT/com.github.anuken:packr:034efe51781d2d8faa90370492133241bfb0283c/' build.gradle ''; + preBuild = '' + # Arc is run at build time for sprite packing, and it needs to see + # the runtime libraries + ${stdenv.lib.optionalString stdenv.isLinux "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${alsaLib}/lib"} + export GRADLE_USER_HOME=$(mktemp -d) + ''; + # The default one still uses jdk8 (#89731) gradle_6 = (gradleGen.override (old: { java = jdk14; })).gradle_6_7; @@ -62,7 +69,7 @@ let # one hash for 'deps'. Deps can be garbage collected after the build, # so this is not really an issue. buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) + ${preBuild} gradle --no-daemon desktop:dist -Pbuildversion=${buildVersion} gradle --no-daemon server:dist -Pbuildversion=${buildVersion} ''; @@ -74,7 +81,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1yv9l8zdml6drmvlgv45w3qas9qmb654x4kja3an4d16k020khr7"; + outputHash = "1kymfrd2vd23y1rmx19q47wc212r6qx03x6g58pxbqyylxmcw5zq"; }; # Separate commands for building and installing the server and the client @@ -109,7 +116,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gradle_6 makeWrapper ]; buildPhase = with stdenv.lib; '' - export GRADLE_USER_HOME=$(mktemp -d) + ${preBuild} # point to offline repo sed -ie "s#mavenLocal()#mavenLocal(); maven { url '${deps}' }#g" build.gradle ${optionalString enableClient buildClient} @@ -125,11 +132,15 @@ stdenv.mkDerivation rec { homepage = "https://mindustrygame.github.io/"; downloadPage = "https://github.com/Anuken/Mindustry/releases"; description = "A sandbox tower defense game"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; # Hash mismatch on darwin: # https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293 - broken = stdenv.isDarwin; + # Problems with native libraries in aarch64: + # https://github.com/NixOS/nixpkgs/pull/107646 + # https://logs.nix.ci/?key=nixos/nixpkgs.107646&attempt_id=3032c060-72e9-4a76-8186-4739544397dd + broken = stdenv.isDarwin || + stdenv.isAarch64; }; } diff --git a/pkgs/games/minecraft/update.sh b/pkgs/games/minecraft/update.sh index 02b362e839be9..485fb5a560f68 100755 --- a/pkgs/games/minecraft/update.sh +++ b/pkgs/games/minecraft/update.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq gnugrep common-updater-scripts +#!nix-shell -i bash -p curl jq common-updater-scripts set -eu -o pipefail -version=$(curl -s 'https://aur.archlinux.org/rpc/?v=5&type=info&arg[]=minecraft-launcher' | jq '.results[0].Version' | grep -Po '[.\d]*(?=-)') -update-source-version minecraft "$version" +version=$(curl -s 'https://launchermeta.mojang.com/v1/products/launcher/6f083b80d5e6fabbc4236f81d0d8f8a350c665a9/linux.json' | jq -r '."launcher-core"[0].version.name') +update-source-version minecraft "${version}" diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index 304a810c3db25..33a0ae1059736 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "X-Ray Engine 1.6 expansion. Original version was used in S.T.A.L.K.E.R.: Call of Pripyat"; + description = "Improved version of the X-Ray Engine, the game engine used in the world-famous S.T.A.L.K.E.R. game series by GSC Game World"; homepage = src.meta.homepage; license = licenses.unfree // { url = "https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt"; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index b0a99e1dc2469..b1437ac46af56 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2020.1204.0"; + version = "2020.1225.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "1yr9rkkmm15lgbfbrvpyp0d66i5v2xs39abw8yv6qlf70qh4bsg5"; + sha256 = "BISczC4xYcF6m5l3ye/bdZxs/aK0Jz6sFVFOgNDo0v0="; }; patches = [ ./bypass-tamper-detection.patch ]; @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { export HOME=$(mktemp -d) export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export DOTNET_NOLOGO=1 nuget sources Add -Name nixos -Source "$PWD/nixos" nuget init "$nugetDeps" "$PWD/nixos" @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { mkdir -p $HOME/.nuget/NuGet cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet - dotnet restore --source "$PWD/nixos" osu.Desktop + dotnet restore --source "$PWD/nixos" osu.Desktop --runtime ${runtimeId} runHook postConfigure ''; @@ -59,6 +59,7 @@ in stdenv.mkDerivation rec { dotnet build osu.Desktop \ --no-restore \ --configuration Release \ + --runtime ${runtimeId} \ -p:Version=${version} runHook postBuild ''; @@ -69,10 +70,9 @@ in stdenv.mkDerivation rec { dotnet publish osu.Desktop \ --no-build \ --configuration Release \ + --runtime ${runtimeId} \ --no-self-contained \ --output $out/lib/osu - shopt -s extglob - rm -r $out/lib/osu/runtimes/!(${runtimeId}) makeWrapper $out/lib/osu/osu\! $out/bin/osu\! \ --set DOTNET_ROOT "${dotnet-netcore}" \ @@ -93,6 +93,13 @@ in stdenv.mkDerivation rec { runHook postInstall ''; + fixupPhase = '' + runHook preFixup + cp -f ${./osu.runtimeconfig.json} "$out/lib/osu/osu!.runtimeconfig.json" + ln -sft $out/lib/osu ${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary} + runHook postFixup + ''; + # Strip breaks the executable. dontStrip = true; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 8a24f0b1bdbb8..cebdde1f7c6dc 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -16,8 +16,8 @@ }) (fetchNuGet { name = "DiscordRichPresence"; - version = "1.0.166"; - sha256 = "019rz0br8hamydmdrgzcc6280jfhm4i4ix27jh66a7h37alvdi3a"; + version = "1.0.169"; + sha256 = "0rs9fjr65432qckmzx4djlwsnc2yqwwwnjszqwnm3z2pv8dm7zrf"; }) (fetchNuGet { name = "FFmpeg.AutoGen"; @@ -25,21 +25,6 @@ sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) (fetchNuGet { - name = "Humanizer"; - version = "2.8.26"; - sha256 = "11kddzyzqpq9gkz0hmrblq494nh86va6wxx6z89xi6w1f4vj15ak"; - }) - (fetchNuGet { - name = "Humanizer.Core"; - version = "2.2.0"; - sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; - }) - (fetchNuGet { - name = "Humanizer.Core"; - version = "2.8.26"; - sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; - }) - (fetchNuGet { name = "Humanizer.Core.af"; version = "2.8.26"; sha256 = "0znrq4frlkq1qi20301hlzxa6mdc275fa1i1a1i8ldgk9cjq94k9"; @@ -100,14 +85,14 @@ sha256 = "1pgs0j5ri50a6vhljplhrlc8jj1hrd9ggxkj60d9v5kk9xibzzyd"; }) (fetchNuGet { - name = "Humanizer.Core.fr"; + name = "Humanizer.Core.fr-BE"; version = "2.8.26"; - sha256 = "0kkhgy3yn8vfqlx3dhb9m3cazkgfxarknam4macng9y17l7wj83m"; + sha256 = "13spcx07hph366qk073pz63s56nadaac7l4mr4a66gbpqd3814kb"; }) (fetchNuGet { - name = "Humanizer.Core.fr-BE"; + name = "Humanizer.Core.fr"; version = "2.8.26"; - sha256 = "13spcx07hph366qk073pz63s56nadaac7l4mr4a66gbpqd3814kb"; + sha256 = "0kkhgy3yn8vfqlx3dhb9m3cazkgfxarknam4macng9y17l7wj83m"; }) (fetchNuGet { name = "Humanizer.Core.he"; @@ -160,14 +145,14 @@ sha256 = "0iai35pzka9g6c3sgswki06fk6gdnq8kc88wyb4pcciivazz31px"; }) (fetchNuGet { - name = "Humanizer.Core.nb"; + name = "Humanizer.Core.nb-NO"; version = "2.8.26"; - sha256 = "0xprhiyjyq6mpha2lrav59n1f48508ddvm9nmdk5sm5k26ff3l90"; + sha256 = "160c98wfh7d2xlvlra4x5rdj4klgcjwcy3gkb4ipg655byn2m1j2"; }) (fetchNuGet { - name = "Humanizer.Core.nb-NO"; + name = "Humanizer.Core.nb"; version = "2.8.26"; - sha256 = "160c98wfh7d2xlvlra4x5rdj4klgcjwcy3gkb4ipg655byn2m1j2"; + sha256 = "0xprhiyjyq6mpha2lrav59n1f48508ddvm9nmdk5sm5k26ff3l90"; }) (fetchNuGet { name = "Humanizer.Core.nl"; @@ -205,14 +190,14 @@ sha256 = "060xbzwb7p9ypbqfklih2zal2rh6h55gq4hv3i6alvlbd3vsx29n"; }) (fetchNuGet { - name = "Humanizer.Core.sr"; + name = "Humanizer.Core.sr-Latn"; version = "2.8.26"; - sha256 = "0i2c24qmqnhp85b088qlbagxd48hcl0v1ly4m7hfbvx5s7fg8riv"; + sha256 = "1911a69sqssh9f007vmxbgyj4ym2ym4423xvw6cmbfhjcrhkfpbi"; }) (fetchNuGet { - name = "Humanizer.Core.sr-Latn"; + name = "Humanizer.Core.sr"; version = "2.8.26"; - sha256 = "1911a69sqssh9f007vmxbgyj4ym2ym4423xvw6cmbfhjcrhkfpbi"; + sha256 = "0i2c24qmqnhp85b088qlbagxd48hcl0v1ly4m7hfbvx5s7fg8riv"; }) (fetchNuGet { name = "Humanizer.Core.sv"; @@ -260,14 +245,29 @@ sha256 = "1rhzbiqbx04l3kvzjklix90fxyc6vvmmw0p564ajdiximivs0pbh"; }) (fetchNuGet { + name = "Humanizer.Core"; + version = "2.2.0"; + sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; + }) + (fetchNuGet { + name = "Humanizer.Core"; + version = "2.8.26"; + sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; + }) + (fetchNuGet { + name = "Humanizer"; + version = "2.8.26"; + sha256 = "11kddzyzqpq9gkz0hmrblq494nh86va6wxx6z89xi6w1f4vj15ak"; + }) + (fetchNuGet { name = "JetBrains.Annotations"; version = "2020.3.0"; sha256 = "04xlfqnfg3069f014q8f0vx7y70m8nldbf9fia4b50bp3rry2lv2"; }) (fetchNuGet { - name = "ManagedBass"; - version = "2.0.4"; - sha256 = "13hwd0yany4j52abbaaqsgq8lag2w9vjxxsj4qfbgwp4qs39x003"; + name = "managed-midi"; + version = "1.9.14"; + sha256 = "025jh146zy98699y4civ7nxlkx312lwkl4sr8pha626q7q1kg89h"; }) (fetchNuGet { name = "ManagedBass.Fx"; @@ -275,9 +275,9 @@ sha256 = "1rbjpgpm0ri7l2gqdy691rsv3visna2nbxawgvhdqljw068r8a8d"; }) (fetchNuGet { - name = "managed-midi"; - version = "1.9.14"; - sha256 = "025jh146zy98699y4civ7nxlkx312lwkl4sr8pha626q7q1kg89h"; + name = "ManagedBass"; + version = "2.0.4"; + sha256 = "13hwd0yany4j52abbaaqsgq8lag2w9vjxxsj4qfbgwp4qs39x003"; }) (fetchNuGet { name = "Markdig"; @@ -285,6 +285,11 @@ sha256 = "0k7v4xlhfgyca8bb1g85062m22skmk6ay0hcyqlpi2cnvy7f61qf"; }) (fetchNuGet { + name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "3.1.8"; + sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; + }) + (fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; version = "3.1.9"; sha256 = "0vsnc87fqh61mjl2zgv7nfx6wkrg055cq12ql6cxmcawv6qsl0lw"; @@ -305,14 +310,14 @@ sha256 = "0xg0psas8k38yfd72q7m5sm00yyxj51j1fqg473za2kxf8z4p2wx"; }) (fetchNuGet { - name = "Microsoft.AspNetCore.SignalR.Client"; + name = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "3.1.9"; - sha256 = "1yn5y3b51jcpw7szj3pfz79hk84kmypy465cm22khh5z34wy41jx"; + sha256 = "0ld7hch240z7zc7ckrppd4yrwwdhx3nbc8fgf4qql8ld8bih223y"; }) (fetchNuGet { - name = "Microsoft.AspNetCore.SignalR.Client.Core"; + name = "Microsoft.AspNetCore.SignalR.Client"; version = "3.1.9"; - sha256 = "0ld7hch240z7zc7ckrppd4yrwwdhx3nbc8fgf4qql8ld8bih223y"; + sha256 = "1yn5y3b51jcpw7szj3pfz79hk84kmypy465cm22khh5z34wy41jx"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Common"; @@ -365,14 +370,14 @@ sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) (fetchNuGet { - name = "Microsoft.CodeAnalysis.CSharp"; + name = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "3.8.0"; - sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; + sha256 = "1jfbqfngwwjx3x1cyqaamf26s7j6wag86ig1n7bh99ny85gd78wb"; }) (fetchNuGet { - name = "Microsoft.CodeAnalysis.CSharp.Workspaces"; + name = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; - sha256 = "1jfbqfngwwjx3x1cyqaamf26s7j6wag86ig1n7bh99ny85gd78wb"; + sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.FxCopAnalyzers"; @@ -430,11 +435,6 @@ sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; }) (fetchNuGet { - name = "Microsoft.EntityFrameworkCore"; - version = "2.2.6"; - sha256 = "18j2cr50wsikwv7gy3vrjvmpdxckvv537qma8afdpr3yn2klayh5"; - }) - (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Abstractions"; version = "2.2.6"; sha256 = "1dyxb5ibx24frlgbqy7zch0falq9p1189zvlbxgl94m0hvpml5j3"; @@ -455,14 +455,19 @@ sha256 = "0c0z4mrqldjfslyxywb2ydk8hn9ybhkvz6lxx3idrfalq3ni5f1z"; }) (fetchNuGet { + name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; + version = "2.2.6"; + sha256 = "0jzqw4672mzxjvzas09sl0zyzzayfgkv003a7bw5g2gjyiphf630"; + }) + (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Sqlite"; version = "2.2.6"; sha256 = "0z8k5ns841imaqha5abb1ka0rsfzy90k6qkrvix11sp6k9i7lsam"; }) (fetchNuGet { - name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; + name = "Microsoft.EntityFrameworkCore"; version = "2.2.6"; - sha256 = "0jzqw4672mzxjvzas09sl0zyzzayfgkv003a7bw5g2gjyiphf630"; + sha256 = "18j2cr50wsikwv7gy3vrjvmpdxckvv537qma8afdpr3yn2klayh5"; }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Abstractions"; @@ -475,16 +480,6 @@ sha256 = "0bzrsn5vas86w66bd04xilnlb21nx4l6lz7d3acvy6y8ir2vb5dv"; }) (fetchNuGet { - name = "Microsoft.Extensions.Configuration"; - version = "2.2.0"; - sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration"; - version = "3.1.9"; - sha256 = "01ci8nhv3ki93aa7a3vh9icl3jav7ikizq43kcgdjgsssi6xvdf9"; - }) - (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.2.0"; sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; @@ -505,14 +500,14 @@ sha256 = "1n8fndd9vrd3d7041p42li8v129mgl3gi8sl1x8whhycy0ahqr78"; }) (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection"; + name = "Microsoft.Extensions.Configuration"; version = "2.2.0"; - sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; + sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl"; }) (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection"; + name = "Microsoft.Extensions.Configuration"; version = "3.1.9"; - sha256 = "1ifjjzwfvd5igxaaxm124qv8afs1nb06rgdqy7l3jcfqr30xykbb"; + sha256 = "01ci8nhv3ki93aa7a3vh9icl3jav7ikizq43kcgdjgsssi6xvdf9"; }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; @@ -525,29 +520,39 @@ sha256 = "1l7ng71y18fwdlyq2ycl12hmv9wrf7k7knz2jwv9w9w7spmp8jv6"; }) (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "2.2.0"; + sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "3.1.9"; + sha256 = "1ifjjzwfvd5igxaaxm124qv8afs1nb06rgdqy7l3jcfqr30xykbb"; + }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; }) (fetchNuGet { - name = "Microsoft.Extensions.Logging"; + name = "Microsoft.Extensions.Logging.Abstractions"; version = "2.2.0"; - sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; + sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; }) (fetchNuGet { - name = "Microsoft.Extensions.Logging"; + name = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.9"; - sha256 = "1x1bbkcq7ph9jgwv3yidipfqwdh6q3bsa2rxhfzmy64l7hc7r1wl"; + sha256 = "1i24mz3v677bmdysxklm9a3qc87j72lpkfp0l16gh6yqpmhwg7vp"; }) (fetchNuGet { - name = "Microsoft.Extensions.Logging.Abstractions"; + name = "Microsoft.Extensions.Logging"; version = "2.2.0"; - sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; + sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; }) (fetchNuGet { - name = "Microsoft.Extensions.Logging.Abstractions"; + name = "Microsoft.Extensions.Logging"; version = "3.1.9"; - sha256 = "1i24mz3v677bmdysxklm9a3qc87j72lpkfp0l16gh6yqpmhwg7vp"; + sha256 = "1x1bbkcq7ph9jgwv3yidipfqwdh6q3bsa2rxhfzmy64l7hc7r1wl"; }) (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; @@ -580,6 +585,11 @@ sha256 = "16cx0x5hcjs2ml5zjalfsp7n3rfyz75ihnvh1p10z96yaz43gdwn"; }) (fetchNuGet { + name = "Microsoft.NETCore.App.Runtime.linux-x64"; + version = "3.1.8"; + sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; + }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; @@ -675,16 +685,16 @@ sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; }) (fetchNuGet { - name = "ppy.osu.Framework"; - version = "2020.1203.0"; - sha256 = "0xk1l09gm39z1739a7bgykj2bkg6lgxx72ds9s7qmbc6nrkr7jwj"; - }) - (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; version = "2020.923.0"; sha256 = "1sy98s0dxcfxxslm1q503qhd9fl8d3idf47qi4561j5fds4dpdsv"; }) (fetchNuGet { + name = "ppy.osu.Framework"; + version = "2020.1222.0"; + sha256 = "0xdfgl4hykrbwhdmhhy7rxp055jhq1rwg2mldbbaf1v43s0vkyfj"; + }) + (fetchNuGet { name = "ppy.osu.Game.Resources"; version = "2020.1202.0"; sha256 = "1m5156gkyyhf52ii6y7yqmsgpwcxn6zgji3nnyny6lk9glmc9vvs"; @@ -710,6 +720,176 @@ sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; }) (fetchNuGet { + name = "runtime.any.System.Collections"; + version = "4.0.11"; + sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0"; + }) + (fetchNuGet { + name = "runtime.any.System.Collections"; + version = "4.3.0"; + sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; + }) + (fetchNuGet { + name = "runtime.any.System.Diagnostics.Tools"; + version = "4.0.1"; + sha256 = "0qcpm90hrm9gx9pmxlvfml65jm0bwpr5dg3r7l7xm9nvmibvc7n7"; + }) + (fetchNuGet { + name = "runtime.any.System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; + }) + (fetchNuGet { + name = "runtime.any.System.Diagnostics.Tracing"; + version = "4.1.0"; + sha256 = "041im8hmp1zdgrx6jzyrdch6kshvbddmkar7r2mlm1ksb5c5kwpq"; + }) + (fetchNuGet { + name = "runtime.any.System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; + }) + (fetchNuGet { + name = "runtime.any.System.Globalization.Calendars"; + version = "4.0.1"; + sha256 = "007iw5wnl046wznasbqxjxm949djdbsi9vwz6zhz4lmzviqcpl58"; + }) + (fetchNuGet { + name = "runtime.any.System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; + }) + (fetchNuGet { + name = "runtime.any.System.Globalization"; + version = "4.0.11"; + sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286"; + }) + (fetchNuGet { + name = "runtime.any.System.Globalization"; + version = "4.3.0"; + sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; + }) + (fetchNuGet { + name = "runtime.any.System.IO"; + version = "4.1.0"; + sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; + }) + (fetchNuGet { + name = "runtime.any.System.IO"; + version = "4.3.0"; + sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; + }) + (fetchNuGet { + name = "runtime.any.System.Reflection.Extensions"; + version = "4.0.1"; + sha256 = "05k34ijz9g9csh0vbbv3g3lrxl163izwcfncmbcl7k073h32rzkr"; + }) + (fetchNuGet { + name = "runtime.any.System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; + }) + (fetchNuGet { + name = "runtime.any.System.Reflection.Primitives"; + version = "4.0.1"; + sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz"; + }) + (fetchNuGet { + name = "runtime.any.System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; + }) + (fetchNuGet { + name = "runtime.any.System.Reflection"; + version = "4.1.0"; + sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6"; + }) + (fetchNuGet { + name = "runtime.any.System.Reflection"; + version = "4.3.0"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; + }) + (fetchNuGet { + name = "runtime.any.System.Resources.ResourceManager"; + version = "4.0.1"; + sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr"; + }) + (fetchNuGet { + name = "runtime.any.System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; + }) + (fetchNuGet { + name = "runtime.any.System.Runtime.Handles"; + version = "4.0.1"; + sha256 = "1kswgqhy34qvc49i981fk711s7knd6z13bp0rin8ms6axkh98nas"; + }) + (fetchNuGet { + name = "runtime.any.System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; + }) + (fetchNuGet { + name = "runtime.any.System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z"; + }) + (fetchNuGet { + name = "runtime.any.System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; + }) + (fetchNuGet { + name = "runtime.any.System.Runtime"; + version = "4.1.0"; + sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; + }) + (fetchNuGet { + name = "runtime.any.System.Runtime"; + version = "4.3.0"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; + }) + (fetchNuGet { + name = "runtime.any.System.Text.Encoding.Extensions"; + version = "4.0.11"; + sha256 = "0d1rxxpvg9v7wlibsfgz0r4hwigpadas822qf8m8fs1gma9gs877"; + }) + (fetchNuGet { + name = "runtime.any.System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; + }) + (fetchNuGet { + name = "runtime.any.System.Text.Encoding"; + version = "4.0.11"; + sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7"; + }) + (fetchNuGet { + name = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + }) + (fetchNuGet { + name = "runtime.any.System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; + }) + (fetchNuGet { + name = "runtime.any.System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; + }) + (fetchNuGet { + name = "runtime.any.System.Threading.Timer"; + version = "4.0.1"; + sha256 = "14p9qc9y8ay6kgz363xlxy5c75ilq3r7zw4ddx7348iir0m140ir"; + }) + (fetchNuGet { + name = "runtime.any.System.Threading.Timer"; + version = "4.3.0"; + sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; + }) + (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; @@ -725,16 +905,6 @@ sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) (fetchNuGet { - name = "runtime.native.System"; - version = "4.0.0"; - sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; - }) - (fetchNuGet { - name = "runtime.native.System"; - version = "4.3.0"; - sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; - }) - (fetchNuGet { name = "runtime.native.System.IO.Compression"; version = "4.1.0"; sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; @@ -755,11 +925,6 @@ 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"; @@ -770,6 +935,21 @@ sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) (fetchNuGet { + name = "runtime.native.System.Security.Cryptography"; + version = "4.0.0"; + sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) + (fetchNuGet { name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; @@ -810,9 +990,84 @@ sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) (fetchNuGet { - name = "Sentry"; - version = "2.1.8"; - sha256 = "1ii62ynihr4j2v2agjizk38kfz3m9bdijkks9k7ydhcq1bcz7jbn"; + name = "runtime.unix.Microsoft.Win32.Primitives"; + version = "4.0.1"; + sha256 = "1i47c440zlibzhyh2dr45jgbsmn3a7ki1paappdf9af4qrlaas63"; + }) + (fetchNuGet { + name = "runtime.unix.Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; + }) + (fetchNuGet { + name = "runtime.unix.System.Console"; + version = "4.0.0"; + sha256 = "0q96nlj42yj0b020j22z6j3qiza7lz7sb1r34dy4r1f3cq9s5zp6"; + }) + (fetchNuGet { + name = "runtime.unix.System.Console"; + version = "4.3.0"; + sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; + }) + (fetchNuGet { + name = "runtime.unix.System.Diagnostics.Debug"; + version = "4.0.11"; + sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; + }) + (fetchNuGet { + name = "runtime.unix.System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; + }) + (fetchNuGet { + name = "runtime.unix.System.IO.FileSystem"; + version = "4.0.1"; + sha256 = "02wnlydnbhai0zy7c3kihg0cis0l1b2z78kyi1ci47c5v0jklwha"; + }) + (fetchNuGet { + name = "runtime.unix.System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; + }) + (fetchNuGet { + name = "runtime.unix.System.Net.Primitives"; + version = "4.0.11"; + sha256 = "1fy9hy30bs3pv6jr2ci2vscgycz64r1bgl91s51psidzh64i1gp9"; + }) + (fetchNuGet { + name = "runtime.unix.System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; + }) + (fetchNuGet { + name = "runtime.unix.System.Net.Sockets"; + version = "4.1.0"; + sha256 = "0vj5n45mm2k2khayvrp1lbz5djnp5lac1dna37g5c0nh7pmzgc4f"; + }) + (fetchNuGet { + name = "runtime.unix.System.Net.Sockets"; + version = "4.3.0"; + sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; + }) + (fetchNuGet { + name = "runtime.unix.System.Private.Uri"; + version = "4.0.1"; + sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; + }) + (fetchNuGet { + name = "runtime.unix.System.Private.Uri"; + version = "4.3.0"; + sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; + }) + (fetchNuGet { + name = "runtime.unix.System.Runtime.Extensions"; + version = "4.1.0"; + sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; + }) + (fetchNuGet { + name = "runtime.unix.System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) (fetchNuGet { name = "Sentry.PlatformAbstractions"; @@ -825,6 +1080,11 @@ sha256 = "04baw4yxc5lbcl83sfcdyjg5225719bf3sxpa3kjmhf58bjr143l"; }) (fetchNuGet { + name = "Sentry"; + version = "2.1.8"; + sha256 = "1ii62ynihr4j2v2agjizk38kfz3m9bdijkks9k7ydhcq1bcz7jbn"; + }) + (fetchNuGet { name = "SharpCompress"; version = "0.17.1"; sha256 = "1ffiacghbcnr3fkgvdcad7b1nky54nhmmn2sm43sks9zm8grvva4"; @@ -915,16 +1175,6 @@ sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { - name = "System.Collections"; - version = "4.0.11"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; - }) - (fetchNuGet { - name = "System.Collections"; - version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; - }) - (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; @@ -950,6 +1200,16 @@ sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) (fetchNuGet { + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; @@ -960,11 +1220,6 @@ sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) (fetchNuGet { - name = "System.Composition"; - version = "1.0.31"; - sha256 = "0aa27jz73qb0xm6dyxv22qhfrmyyqjyn2dvvsd9asi82lcdh9i61"; - }) - (fetchNuGet { name = "System.Composition.AttributedModel"; version = "1.0.31"; sha256 = "1ipyb86hvw754kmk47vjmzyilvj5hymg9nqabz70sbgsz1fygrdv"; @@ -990,6 +1245,11 @@ sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63"; }) (fetchNuGet { + name = "System.Composition"; + version = "1.0.31"; + sha256 = "0aa27jz73qb0xm6dyxv22qhfrmyyqjyn2dvvsd9asi82lcdh9i61"; + }) + (fetchNuGet { name = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; @@ -1050,16 +1310,6 @@ sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) (fetchNuGet { - name = "System.Globalization"; - version = "4.0.11"; - sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; - }) - (fetchNuGet { - name = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; @@ -1080,19 +1330,29 @@ sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) (fetchNuGet { + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { name = "System.Interactive.Async"; version = "3.2.0"; sha256 = "0y5r5y7dlccjpgg17rjrrzi3jya4ysyydamxs33qckkv4jb3534d"; }) (fetchNuGet { - name = "System.IO"; - version = "4.1.0"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + name = "System.IO.Compression.ZipFile"; + version = "4.0.1"; + sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) (fetchNuGet { - name = "System.IO"; + name = "System.IO.Compression.ZipFile"; version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) (fetchNuGet { name = "System.IO.Compression"; @@ -1105,14 +1365,14 @@ sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) (fetchNuGet { - name = "System.IO.Compression.ZipFile"; + name = "System.IO.FileSystem.Primitives"; version = "4.0.1"; - sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { - name = "System.IO.Compression.ZipFile"; + name = "System.IO.FileSystem.Primitives"; version = "4.3.0"; - sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) (fetchNuGet { name = "System.IO.FileSystem"; @@ -1125,16 +1385,6 @@ sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.0.1"; - sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; - }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; - }) - (fetchNuGet { name = "System.IO.Packaging"; version = "5.0.0"; sha256 = "08l85pi8jy65las973szqdnir2awxp0r16h21c0bgrz19gxhs11n"; @@ -1145,14 +1395,14 @@ sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy"; }) (fetchNuGet { - name = "System.Linq"; + name = "System.IO"; version = "4.1.0"; - sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { - name = "System.Linq"; + name = "System.IO"; version = "4.3.0"; - sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { name = "System.Linq.Expressions"; @@ -1170,6 +1420,16 @@ sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw"; }) (fetchNuGet { + name = "System.Linq"; + version = "4.1.0"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) + (fetchNuGet { name = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; @@ -1200,6 +1460,16 @@ sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) (fetchNuGet { + name = "System.Net.NameResolution"; + version = "4.0.0"; + sha256 = "0dj3pvpv069nyia28gkl4a0fb7q33hbxz2dg25qvpah3l7pbl0qh"; + }) + (fetchNuGet { + name = "System.Net.NameResolution"; + version = "4.3.0"; + sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; + }) + (fetchNuGet { name = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; @@ -1240,24 +1510,14 @@ sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) (fetchNuGet { - name = "System.Reflection"; - version = "4.1.0"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; - }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; + name = "System.Private.Uri"; version = "4.0.1"; - sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; }) (fetchNuGet { - name = "System.Reflection.Emit"; + name = "System.Private.Uri"; version = "4.3.0"; - sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; @@ -1285,6 +1545,16 @@ sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; }) (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; @@ -1325,24 +1595,24 @@ sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) (fetchNuGet { - name = "System.Resources.ResourceManager"; - version = "4.0.1"; - sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) (fetchNuGet { - name = "System.Resources.ResourceManager"; + name = "System.Reflection"; version = "4.3.0"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { - name = "System.Runtime"; - version = "4.1.0"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + name = "System.Resources.ResourceManager"; + version = "4.0.1"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) (fetchNuGet { - name = "System.Runtime"; + name = "System.Resources.ResourceManager"; version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; @@ -1385,16 +1655,6 @@ sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; - }) - (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; @@ -1405,6 +1665,16 @@ sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; @@ -1420,11 +1690,31 @@ sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { name = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { + name = "System.Security.Claims"; + version = "4.0.1"; + sha256 = "03dw0ls49bvsrffgwycyifjgz0qzr9r85skqhdyhfd51fqf398n6"; + }) + (fetchNuGet { + name = "System.Security.Claims"; + version = "4.3.0"; + sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; + }) + (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; @@ -1496,18 +1786,28 @@ }) (fetchNuGet { name = "System.Security.Principal.Windows"; + version = "4.0.0"; + sha256 = "1d3vc8i0zss9z8p4qprls4gbh7q4218l9845kclx7wvw41809k6z"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.3.0"; + sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.0.11"; - sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + name = "System.Security.Principal"; + version = "4.0.1"; + sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p"; }) (fetchNuGet { - name = "System.Text.Encoding"; + name = "System.Security.Principal"; version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) (fetchNuGet { name = "System.Text.Encoding.CodePages"; @@ -1530,6 +1830,16 @@ sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + (fetchNuGet { name = "System.Text.Encodings.Web"; version = "4.7.1"; sha256 = "1wj7r07mjwbf9a79kapy2l9m8mcq8b3nbhg0zaprlsav09k85fmb"; @@ -1550,31 +1860,11 @@ sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { - name = "System.Threading"; - version = "4.0.11"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; - }) - (fetchNuGet { - name = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }) - (fetchNuGet { name = "System.Threading.Channels"; version = "4.7.1"; sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2"; }) (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; - }) - (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.3.0"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; - }) - (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; @@ -1590,11 +1880,31 @@ sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + (fetchNuGet { name = "System.Threading.Thread"; version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; }) (fetchNuGet { + name = "System.Threading.ThreadPool"; + version = "4.0.10"; + sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; + }) + (fetchNuGet { + name = "System.Threading.ThreadPool"; + version = "4.3.0"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }) + (fetchNuGet { name = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; @@ -1605,6 +1915,16 @@ sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; diff --git a/pkgs/games/osu-lazer/osu.runtimeconfig.json b/pkgs/games/osu-lazer/osu.runtimeconfig.json new file mode 100644 index 0000000000000..ec942fede66ec --- /dev/null +++ b/pkgs/games/osu-lazer/osu.runtimeconfig.json @@ -0,0 +1,9 @@ +{ + "runtimeOptions": { + "tfm": "netcoreapp3.1", + "framework": { + "name": "Microsoft.NETCore.App", + "version": "3.1.0" + } + } +} diff --git a/pkgs/games/osu-lazer/update.sh b/pkgs/games/osu-lazer/update.sh index be8fa3fe7168d..3c78ae8a50a87 100755 --- a/pkgs/games/osu-lazer/update.sh +++ b/pkgs/games/osu-lazer/update.sh @@ -5,7 +5,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")" deps_file="$(realpath "./deps.nix")" -new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases" | jq -r '.[0].name')" +new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases?per_page=1" | jq -r '.[0].name')" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" if [[ "$new_version" == "$old_version" ]]; then echo "Up to date" @@ -36,7 +36,7 @@ cat >./nuget_tmp.config <<EOF </configuration> EOF -dotnet restore osu.Desktop --configfile ./nuget_tmp.config +dotnet restore osu.Desktop --configfile ./nuget_tmp.config --runtime linux-x64 echo "{ fetchNuGet }: [" >"$deps_file" while read pkg_spec; do diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/games/r2mod_cli/default.nix new file mode 100644 index 0000000000000..d49dda36e5707 --- /dev/null +++ b/pkgs/games/r2mod_cli/default.nix @@ -0,0 +1,34 @@ +{ fetchFromGitHub +, jq +, makeWrapper +, p7zip +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "r2mod_cli"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "Foldex"; + repo = "r2mod_cli"; + rev = "v${version}"; + sha256 = "1g64f8ms7yz4rzm6xb93agc08kh9sbwkhvq35dpfhvi6v59j3n5m"; + }; + + buildInputs = [ makeWrapper ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/r2mod --prefix PATH : "${stdenv.lib.makeBinPath [ jq p7zip ]}"; + ''; + + meta = with stdenv.lib; { + description = "A Risk of Rain 2 Mod Manager in Bash"; + homepage = "https://github.com/foldex/r2mod_cli"; + license = licenses.gpl3Only; + maintainers = [ maintainers.reedrw ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 33dc364c5b700..231090419e660 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar +{ stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkgconfig, curl, libtorrent-rasterbar , libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring , makeWrapper, glib, minizip, alure, pcre, jsoncpp }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig gettext doxygen makeWrapper ]; buildInputs = [ - wxGTK30 openal curl libtorrentRasterbar pcre jsoncpp + wxGTK30 openal curl libtorrent-rasterbar pcre jsoncpp boost libpng libX11 libnotify gtk2 glib minizip alure ]; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index d3d5b3a2271e3..4c57ce9aeb024 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -6,6 +6,7 @@ , nativeOnly ? false , runtimeOnly ? false , runtimeShell +, stdenv # DEPRECATED , withJava ? config.steam.java or false @@ -43,24 +44,34 @@ let ++ lib.optional withPrimus primus ++ extraPkgs pkgs; - ldPath = map (x: "/steamrt/${steam-runtime-wrapped.arch}/" + x) steam-runtime-wrapped.libs - ++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs); + ldPath = lib.optionals stdenv.is64bit [ "/lib64" ] + ++ [ "/lib32" ] + ++ map (x: "/steamrt/${steam-runtime-wrapped.arch}/" + x) steam-runtime-wrapped.libs + ++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs); # Zachtronics and a few other studios expect STEAM_LD_LIBRARY_PATH to be present exportLDPath = '' - export LD_LIBRARY_PATH=/lib32:/lib64:${lib.concatStringsSep ":" ldPath}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH export STEAM_LD_LIBRARY_PATH="$STEAM_LD_LIBRARY_PATH''${STEAM_LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; + # bootstrap.tar.xz has 444 permissions, which means that simple deletes fail + # and steam will not be able to start + fixBootstrap = '' + if [ -r $HOME/.local/share/Steam/bootstrap.tar.xz ]; then + chmod +w $HOME/.local/share/Steam/bootstrap.tar.xz + fi + ''; + setupSh = writeScript "setup.sh" '' #!${runtimeShell} ''; runSh = writeScript "run.sh" '' #!${runtimeShell} - runtime_paths="/lib32:/lib64:${lib.concatStringsSep ":" ldPath}" + runtime_paths="${lib.concatStringsSep ":" ldPath}" if [ "$1" == "--print-steam-runtime-library-paths" ]; then - echo "$runtime_paths" + echo "$runtime_paths''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" exit 0 fi export LD_LIBRARY_PATH="$runtime_paths''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" @@ -226,7 +237,7 @@ in buildFHSUserEnv rec { mkdir -p $out/share/applications ln -s ${steam}/share/icons $out/share ln -s ${steam}/share/pixmaps $out/share - sed "s,/usr/bin/steam,steam,g" ${steam}/share/applications/steam.desktop > $out/share/applications/steam.desktop + ln -s ${steam}/share/applications/steam.desktop $out/share/applications/steam.desktop ''; profile = '' @@ -261,6 +272,7 @@ in buildFHSUserEnv rec { fi fi ${lib.optionalString (!nativeOnly) exportLDPath} + ${fixBootstrap} exec steam "$@" ''; @@ -287,6 +299,7 @@ in buildFHSUserEnv rec { fi shift ${lib.optionalString (!nativeOnly) exportLDPath} + ${fixBootstrap} exec -- "$run" "$@" ''; }; diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index 20ccba641e4ac..ed837c9f0bd2e 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl, runtimeShell, traceDeps ? false}: +{ stdenv, fetchurl, runtimeShell, traceDeps ? false, bash }: let traceLog = "/tmp/steam-trace-dependencies.log"; - version = "1.0.0.61"; + version = "1.0.0.68"; in stdenv.mkDerivation { pname = "steam-original"; @@ -10,7 +10,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz"; - sha256 = "0c5xy57gwr14vp3wy3jpqi5dl6y7n01p2dy4jlgl9bf9x7616r6n"; + sha256 = "sha256-ZeiCYjxnH0Ath5bB20QHmE8R3wU4/3RiAw2NUhrrKNM="; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; @@ -26,14 +26,22 @@ in stdenv.mkDerivation { EOF chmod +x $out/bin/steamdeps ''} - install -d $out/lib/udev/rules.d - install -m644 lib/udev/rules.d/*.rules $out/lib/udev/rules.d + + # install udev rules + mkdir -p $out/etc/udev/rules.d/ + cp ./subprojects/steam-devices/*.rules $out/etc/udev/rules.d/ + substituteInPlace $out/etc/udev/rules.d/60-steam-input.rules \ + --replace "/bin/sh" "${bash}/bin/bash" + + # this just installs a link, "steam.desktop -> /lib/steam/steam.desktop" + rm $out/share/applications/steam.desktop + sed -e 's,/usr/bin/steam,steam,g' steam.desktop > $out/share/applications/steam.desktop ''; meta = with stdenv.lib; { description = "A digital distribution platform"; homepage = "http://store.steampowered.com/"; license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ jagajaga ]; + maintainers = with maintainers; [ jagajaga jonringer ]; }; } diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 60ebdcf8eebf6..6f7ee6962bf8f 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -45,7 +45,7 @@ let desktopItem = makeDesktopItem { name = "xonotic"; - exec = "$out/bin/xonotic"; + exec = "xonotic"; comment = meta.description; desktopName = "Xonotic"; categories = "Game;Shooter;"; diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index 40a8849ba3f18..bb62271a3109a 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: # this package is working only as root # in order to work as a non privileged user you would need to suid the bin -stdenv.mkDerivation { - name = "beep-1.3"; - src = fetchurl { - url = "http://www.johnath.com/beep/beep-1.3.tar.gz"; - sha256 = "0bgch6jq5cahakk3kbr9549iysf2dik09afixxy5brbxk1xfzb2r"; +stdenv.mkDerivation rec { + pname = "beep"; + version = "1.4.9"; + + src = fetchFromGitHub { + owner = "spkr-beep"; + repo = "beep"; + rev = "v${version}"; + sha256 = "JLaoiINHpIFWSqsRl8wJ/NeBu7SCcPuT/BzY8szEu0o="; }; - makeFlags = [ "INSTALL_DIR=\${out}/bin/" "MAN_DIR=\${out}/man/man1/" ]; + makeFlags = [ "DESTDIR=\${out}" "prefix="]; - preInstall = '' - mkdir -p $out/bin - mkdir -p $out/man/man1 - ''; - meta = { + meta = with stdenv.lib; { description = "The advanced PC speaker beeper"; - homepage = "http://www.johnath.com/beep/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/spkr-beep/beep"; + license = licenses.gpl2Only; + platforms = platforms.linux; }; } diff --git a/pkgs/misc/cups/drivers/kyodialog3/default.nix b/pkgs/misc/cups/drivers/kyodialog3/default.nix index fa16a136f9779..7e0a0dea67d17 100644 --- a/pkgs/misc/cups/drivers/kyodialog3/default.nix +++ b/pkgs/misc/cups/drivers/kyodialog3/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { dontStrip = true; src = fetchzip { - url = "https://usa.kyoceradocumentsolutions.com/content/dam/kdc/kdag/downloads/technical/executables/drivers/kyoceradocumentsolutions/us/en/Kyocera_Linux_PPD_Ver_${version}.tar.gz"; + url = "https://la.kyoceradocumentsolutions.com/content/dam/kdc/kdag/downloads/technical/executables/drivers/kyoceradocumentsolutions/lad/en/Kyocera_Linux_PPD_Ver_${version}.tar.gz"; sha256 = "11znnlkfssakml7w80gxlz1k59f3nvhph91fkzzadnm9i7a8yjal"; }; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index eb88476432bfd..9054c4c48f8a2 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -65,6 +65,40 @@ let plugins = { }; meta = common_meta // { description = "Plugin to support " + passthru.hw + " scanner in sane"; }; }; + v370 = stdenv.mkDerivation rec { + name = "iscan-v370-bundle"; + version = "2.30.4"; + + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/perfection-v370/rpm/x64/iscan-perfection-v370-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v370/rpm/x64/iscan-perfection-v370-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "1ff7adp9mha1i2ibllz540xkagpy8r757h4s3h60bgxbyzv2yggr"; + }; + + nativeBuildInputs = [ autoPatchelfHook rpm ]; + + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-perfection-v370-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + + + mkdir -p $out/share $out/lib + cp -r usr/share/{iscan-data,iscan}/ $out/share + cp -r usr/lib64/iscan $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x014a "$plugin/lib/esci/libiscan-plugin-perfection-v370 $plugin/share/esci/esfwdd.bin" + ''; + hw = "Perfection V37/V370"; + }; + meta = common_meta // { description = "Plugin to support " + passthru.hw + " scanner in sane"; }; + }; x770 = stdenv.mkDerivation rec { pname = "iscan-gt-x770-bundle"; version = "2.30.4"; diff --git a/pkgs/misc/emulators/craftos-pc/default.nix b/pkgs/misc/emulators/craftos-pc/default.nix new file mode 100644 index 0000000000000..42fb33051e611 --- /dev/null +++ b/pkgs/misc/emulators/craftos-pc/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, poco, openssl, SDL2, SDL2_mixer }: + +let + craftos2-lua = fetchFromGitHub { + owner = "MCJack123"; + repo = "craftos2-lua"; + rev = "v2.4.4"; + sha256 = "1q63ki4sxx8bxaa6ag3xj153p7a8a12ivm0k33k935p41k6y2k64"; + }; +in + +stdenv.mkDerivation rec { + pname = "craftos-pc"; + version = "2.4.5"; + + src = fetchFromGitHub { + owner = "MCJack123"; + repo = "craftos2"; + rev = "v${version}"; + sha256 = "00a4p365krbdprlv4979d13mm3alhxgzzj3vqz2g67795plf64j4"; + }; + + buildInputs = [ poco openssl SDL2 SDL2_mixer ]; + + preBuild = '' + cp -R ${craftos2-lua}/* ./craftos2-lua/ + chmod -R u+w ./craftos2-lua + make -C craftos2-lua linux + ''; + + installPhase = '' + mkdir -p $out/bin + DESTDIR=$out/bin make install + ''; + + meta = with stdenv.lib; { + description = "An implementation of the CraftOS-PC API written in C++ using SDL"; + homepage = "https://www.craftos-pc.cc"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.siraben ]; + }; +} diff --git a/pkgs/misc/emulators/dgen-sdl/default.nix b/pkgs/misc/emulators/dgen-sdl/default.nix new file mode 100644 index 0000000000000..1eabf5b53b015 --- /dev/null +++ b/pkgs/misc/emulators/dgen-sdl/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, fetchurl +, libarchive +, doxygen +, SDL +}: + +let + pname = "dgen-sdl"; + version = "1.33"; +in stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://sourceforge.net/projects/dgen/files/dgen/${version}/${pname}-${version}.tar.gz"; + hash = "sha256-meLAYBfCKHPHf4gYbrzAmGckTrbgQsdjuwlLArje9h4="; + }; + + buildInputs = [ SDL libarchive ]; + + configureFlags = [ + "--enable-joystick" + "--enable-debugger" + "--enable-debug-vdp" + "--enable-pico" # experimental + "--enable-vgmdump" + "--with-star=no" # Needs ASM support + "--with-musa" + "--with-cyclone=no" # Needs ASM support + "--with-mz80" + "--with-cz80" + "--with-drz80=no" # Needs ASM support + "--with-dz80" + ]; + + meta = with stdenv.lib; { + homepage = "https://dgen.sourceforge.net/"; + description = "Sega Genesis/Mega Drive emulator"; + longDescription = '' + DGen/SDL is a free, open source emulator for Sega Genesis/Mega Drive + systems. DGen was originally written by Dave, then ported to SDL by Joe + Groff and Phil K. Hornung in 1998. + + It features: + + - Game Genie/Hex codes support + - PAL/NTSC, fullscreen modes + - Joypad/joystick support + - Mouse support + - Highly configurable controls + - OpenGL textured video output + - Portable (64‐bit, endian safe), runs in Windows using MinGW + - Screenshots, demos recording and playback + - Musashi (generic) and StarScream (x86‐only) CPU cores + - Cyclone 68000 and DrZ80 (both ARM‐only) CPU cores + - CZ80 (generic) and MZ80 (generic and x86‐only versions) + - 16‐bit, 8000 to 48000Hz sound output + - Support for 8, 15, 16, 24 and 32 bpp modes + - Archived/compressed ROMs support + - M68K debugger (contributed by Edd Barrett) + - Z80 debugger + - hqx and scale2x upscaling filters + - VGM dumping + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} +# TODO: implement configure options diff --git a/pkgs/misc/emulators/reicast/default.nix b/pkgs/misc/emulators/reicast/default.nix new file mode 100644 index 0000000000000..c9dff7217d2f1 --- /dev/null +++ b/pkgs/misc/emulators/reicast/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +, curl +, alsaLib +, libGLU +, libX11 +, libevdev +, udev +, libpulseaudio +}: + +stdenv.mkDerivation rec { + pname = "reicast"; + version = "20.04"; + + src = fetchFromGitHub { + owner = "reicast"; + repo = "reicast-emulator"; + rev = "r${version}"; + sha256 = "0vz3b1hg1qj6nycnqq5zcpzqpcbxw1c2ffamia5z3x7rapjx5d71"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + curl + alsaLib + libGLU + libX11 + libevdev + udev + libpulseaudio + ]; + + # No rule to make target 'install' + installPhase = '' + runHook preInstall + + install -D ./reicast $out/bin/reicast + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = "https://reicast.com/"; + description = "A multi-platform Sega Dreamcast emulator"; + license = with licenses; [ bsd3 gpl2Only lgpl2Only ]; + platforms = ["x86_64-linux" ]; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 4b16e78cd7364..afa1728238538 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -77,8 +77,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20200412"; - sha256 = "0ccr8wdmhkhbccxs5hvn44ppl969n8j0c3rnnir5v6akjcb2nzzv"; + version = "20201206"; + sha256 = "1xs09v1zr98yvwvdsmzgryc2hbk92mwn54yxx8162l461465razc"; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/misc/emulators/yuzu/default.nix b/pkgs/misc/emulators/yuzu/default.nix new file mode 100644 index 0000000000000..3c643822c16e4 --- /dev/null +++ b/pkgs/misc/emulators/yuzu/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub +, cmake, pkgconfig, wrapQtAppsHook +, boost173, catch2, fmt, lz4, nlohmann_json, rapidjson, zlib, zstd, SDL2 +, udev, libusb1, libzip, qtbase, qtwebengine, qttools, ffmpeg +, libpulseaudio, libjack2, alsaLib, sndio, ecasound +, useVulkan ? true, vulkan-loader, vulkan-headers +}: + +stdenv.mkDerivation rec { + pname = "yuzu"; + version = "482"; + + src = fetchFromGitHub { + owner = "yuzu-emu"; + repo = "yuzu-mainline"; # They use a separate repo for mainline “branch” + rev = "mainline-0-${version}"; + sha256 = "1bhkdbhj1dv33qv0np26gzsw65p4z88whjmd6bc7mh2b5lvrjwxm"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + buildInputs = [ qtbase qtwebengine qttools boost173 catch2 fmt lz4 nlohmann_json rapidjson zlib zstd SDL2 udev libusb1 libpulseaudio alsaLib sndio ecasound libjack2 libzip ffmpeg ] + ++ stdenv.lib.optionals useVulkan [ vulkan-loader vulkan-headers ]; + cmakeFlags = [ "-DENABLE_QT_TRANSLATION=ON" "-DYUZU_USE_QT_WEB_ENGINE=ON" "-DUSE_DISCORD_PRESENCE=ON" ] + ++ stdenv.lib.optionals (!useVulkan) [ "-DENABLE_VULKAN=No" ]; + + # Trick the configure system. This prevents a check for submodule directories. + preConfigure = "rm .gitmodules"; + + # Fix vulkan detection + postFixup = stdenv.lib.optionals useVulkan '' + wrapProgram $out/bin/yuzu --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + wrapProgram $out/bin/yuzu-cmd --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + ''; + + meta = with stdenv.lib; { + homepage = "https://yuzu-emu.org"; + description = "An experimental Nintendo Switch emulator written in C++"; + license = with licenses; [ + gpl2Plus + # Icons + cc-by-nd-30 cc0 + ]; + maintainers = with maintainers; [ ivar joshuafern ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix index 6ceb4d6c1a3da..96d1c17fb2948 100644 --- a/pkgs/misc/mxt-app/default.nix +++ b/pkgs/misc/mxt-app/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, autoreconfHook, libtool }: stdenv.mkDerivation rec { - version="1.28"; + version="1.32"; pname = "mxt-app"; src = fetchFromGitHub { owner = "atmel-maxtouch"; repo = "mxt-app"; rev = "v${version}"; - sha256 = "1z2mir4ib9xzxmy0daazzvlga41n80zch1xyp1iz98rrdsnvd1la"; + sha256 = "1z1g5h14j3yw3r9phgir33s9j07ns9c0r5lkl49940pzqycnrwbj"; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libtool ]; - + hardeningDisable = [ "fortify" ]; meta = with stdenv.lib; { diff --git a/pkgs/misc/ptouch-print/default.nix b/pkgs/misc/ptouch-print/default.nix new file mode 100644 index 0000000000000..ac15ec6330973 --- /dev/null +++ b/pkgs/misc/ptouch-print/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchgit +, autoreconfHook +, gd +, libusb1 +}: + +stdenv.mkDerivation rec { + pname = "ptouch-print"; + version = "1.4.3"; + + src = fetchgit { + url = "https://mockmoon-cybernetics.ch/cgi/cgit/linux/ptouch-print.git"; + rev = "v${version}"; + sha256 = "0i57asg2hj1nfwy5lcb0vhrpvb9dqfhf81vh4i929h1kiqhlw2hx"; + }; + + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = [ + gd + libusb1 + ]; + + meta = with stdenv.lib; { + description = "Command line tool to print labels on Brother P-Touch printers on Linux"; + license = licenses.gpl3Plus; + homepage = "https://mockmoon-cybernetics.ch/computer/p-touch2430pc/"; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 28ac5e6f91f50..f10a2846de051 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -208,6 +208,10 @@ in rec { rev = "416f613d3eaadbe1f6f9eda77c49430527ebaffb"; sha256 = "1xbzdyhsgaq2in0f8f491gwjmx6cxpkf2c35d2dk0kg4jfs505sz"; }; + postInstall = '' + sed -i -e 's|ruby|${pkgs.ruby}/bin/ruby|g' $target/scripts/tmux-jump.sh + ''; + dependencies = [ pkgs.ruby ]; meta = with stdenv.lib; { homepage = "https://github.com/schasse/tmux-jump"; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 1e3be6f201275..ccaa9b1ff1b29 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 = "2020-11-29"; + version = "2020-12-16"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "03b6978a270107b670b0363d50f3eed4b365ba26"; - sha256 = "093h23phmpn7c4w519klja7s8saa889y2r3i6rbxjzxg8qbqd44v"; + rev = "f996ede5999c99b1b3e3cecc02dbd06cb286d3ff"; + sha256 = "0sdi933zl64j31i72m6hwx6bayrms3j4z3mkwhyb51qy8bg55kpv"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -209,12 +209,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2020-10-24"; + version = "2020-12-10"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "6ab7034fde6e6e4307df83d8735643b0fe1ff641"; - sha256 = "0ds3xxb2w645aspn2d1n5543h9vpn869aihq68z0ajkvvl8mr66z"; + rev = "d20555a51bb73c58c0a8e627ca118305a0865643"; + sha256 = "0r5x0h90158g5b7ipl4b4jfbxbcs44586aacff1qirrnjwkp27l0"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -291,6 +291,18 @@ let meta.homepage = "https://github.com/euclidianAce/BetterLua.vim/"; }; + brainfuck-vim = buildVimPluginFrom2Nix { + pname = "brainfuck-vim"; + version = "2020-12-16"; + src = fetchFromGitHub { + owner = "fruit-in"; + repo = "brainfuck-vim"; + rev = "1e0f81c11214c6cc27dc55775fe6f43216fcf09a"; + sha256 = "0wvz7gbjnk2lm6jbxmsxfs6hc38g8zwmrqw2clkzpj7kvs1ayw26"; + }; + meta.homepage = "https://github.com/fruit-in/brainfuck-vim/"; + }; + bufexplorer = buildVimPluginFrom2Nix { pname = "bufexplorer"; version = "2020-02-17"; @@ -437,24 +449,24 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2020-12-09"; + version = "2020-12-11"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "b45ac3584ef1c091c9d8a2ced6a1b8b8e4edb611"; - sha256 = "11k6pbvlvqsnvn75rh4pz5c4x6c9jmnwpnikaf1n7amw2w2i6j00"; + rev = "2335a2325488c0e43974a70f307e77afc15382d9"; + sha256 = "1cpqypqlw7bwm6a8jc0kkrb0nyxa375s6rw4rq2lss8jlwxcsia2"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-12-07"; + version = "2020-12-14"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "94103981228454680736c2d728862ec4616cd3ac"; - sha256 = "1cq2vklr2f8dnlaq5ld8i7cjyg4x130myia4ln0wh8n1zgsvgld0"; + rev = "39f128c29fea82ebd7920e632a9fe81d829c89b4"; + sha256 = "0f7wfmvnmh3007yblq5jswrh1iapl66ibcc4q7pz6ansm38apj8j"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -485,12 +497,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-12-08"; + version = "2020-12-16"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "6b3056d42ff206db56336d583841b643994bf2f7"; - sha256 = "05y2sgsj9qk701v23d6qi43nm9dk19pmin4srhsa6nq9mab98gqd"; + rev = "8c9d90539cdaecfd782d78a7a729100d9e30557d"; + sha256 = "1jgbilhldxc6cd7wmffcahp2yr2fv7lmnx5g4j0kcgw5fcd79nsn"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -786,24 +798,24 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-12-09"; + version = "2020-12-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "dc32bf1703caa8598131b72ae477680c3033e768"; - sha256 = "0nl9nndxk21zpwxd17b574bwszqma2vnr8iynh6x6ly6gbphipnh"; + rev = "609e858b5211ec4de45cb93045ab320c961048b2"; + sha256 = "0yigdh18cnb6732613jps0zv0awwmqiz47hsxry65p71by72f026"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; delimitMate = buildVimPluginFrom2Nix { pname = "delimitMate"; - version = "2020-07-29"; + version = "2020-12-14"; src = fetchFromGitHub { owner = "Raimondi"; repo = "delimitMate"; - rev = "16687aec24d803bc76cae2d7bfe2b73b1cdda4ef"; - sha256 = "067bj6if0jyqy1x3hqjdc2d4jrgldz1ffppb4l9ih06m03zdqkjd"; + rev = "537a1da0fa5eeb88640425c37e545af933c56e1b"; + sha256 = "0vjs11bx5zp6xqny5fd3lhqqvqaz6xjgncyga7hb0x5v6zng7gaj"; }; meta.homepage = "https://github.com/Raimondi/delimitMate/"; }; @@ -834,24 +846,24 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-11-16"; + version = "2020-12-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "3868302180248a19967f32a3d0f2d0057612ae34"; - sha256 = "0p3gmh9ag442zx67rkf15qdlciiwzd0aazd9sribximgl3a5jq6r"; + rev = "54be7f99b9f754c532034c77dcb717200d522a21"; + sha256 = "1gy91qz7w1ih3an3b8qgxgglk5q8v7pqjsps3zbj0dbxc6hfn6wl"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2020-12-09"; + version = "2020-12-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "7a382825cc18ff0b00dd2e571b7f80bff020ea86"; - sha256 = "1abb8k4ksc7wssba7pv721nqfnbcicy253mzgw1xfmzkvf3zcl8x"; + rev = "2bd742e2eadf6436e85aed1e95d43775524f0118"; + sha256 = "0rnsjxspiic0vqqnhsxws752q6xiq1g7yvx790ra3sf2j6nj8j6r"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1076,12 +1088,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-12-04"; + version = "2020-12-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "7e1949752f52ba5b8cd8316915be20c475fbd100"; - sha256 = "0srn575974dhxzlj40xi203kfpm9x23vx55ma22w0dh8x8xhjpy1"; + rev = "2849fa544b9a3a07ec1ddafb2bb6f72945b24c62"; + sha256 = "08a5gb2hyqvpwj887g348vzxf14c28kls8dc86cizx5l1g6q2kpa"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1258,12 +1270,12 @@ let far-vim = buildVimPluginFrom2Nix { pname = "far-vim"; - version = "2020-07-23"; + version = "2020-12-12"; src = fetchFromGitHub { owner = "brooth"; repo = "far.vim"; - rev = "aaf7b252301d03100ba3923c17d026562a0b17b8"; - sha256 = "10ij80x2drmk3jr5c7pm9k3jrci9qb26gmqagpxpmiv1is9sdx0a"; + rev = "f92a9ef537c195815ddc12ce919dae607f3d887b"; + sha256 = "1i6mzbfylq3212saipq79s5yb00y9083wsi7dax37bcfb8ryl841"; }; meta.homepage = "https://github.com/brooth/far.vim/"; }; @@ -1379,12 +1391,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-12-07"; + version = "2020-12-14"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "8fa9cf052409bbadf6bf24711b63bdb52c15c786"; - sha256 = "1hiabzz7gb3yd41ncgghcqkibl8x1ymc6zp3f85hjrg1aqc8ibgj"; + rev = "e9d62b4c873f5f207202b4ba5bbd63de7003a0d3"; + sha256 = "0zifj72fm2c533cdj6ddkvm8y6p76imwmbnbm6l6s03zp1yq4kqy"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1403,12 +1415,12 @@ let gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2020-10-07"; + version = "2020-12-16"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "3d90ee5686e54fb1c3242f10e644a789579a4372"; - sha256 = "0qvfqw38vk9ijwhgivjwh289vnmzc2p7cp6jiqpj98zsnank0yw2"; + rev = "4cc031a5d3384ee9cc3225ff038a633be6b7125f"; + sha256 = "0pdska6qkk734hplhyp2cw89xn2c897vgw72fgn2239pqryz5g4n"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -1475,12 +1487,12 @@ let glow-nvim = buildVimPluginFrom2Nix { pname = "glow-nvim"; - version = "2020-08-31"; + version = "2020-12-12"; src = fetchFromGitHub { owner = "npxbr"; repo = "glow.nvim"; - rev = "21ed617b1a16997a02f54ae05c1a9dc3f3c503bf"; - sha256 = "0qkvxly52qdxw77mlrwzrjp8i6smzmsd6k4pd7qqq2w8s8y8rda3"; + rev = "fcd055b797553ffaa03061cb7e81b02a4626c6a6"; + sha256 = "0kbwgw5q9i6irzdy656j4xbqfv5r1p8cd3xdfjszxymnnzrivy49"; }; meta.homepage = "https://github.com/npxbr/glow.nvim/"; }; @@ -2134,6 +2146,18 @@ let meta.homepage = "https://github.com/vim-scripts/mayansmoke/"; }; + mkdx = buildVimPluginFrom2Nix { + pname = "mkdx"; + version = "2020-10-12"; + src = fetchFromGitHub { + owner = "SidOfc"; + repo = "mkdx"; + rev = "65f343251d99c20db9f22e9c836b709f249129f6"; + sha256 = "06xz12h87wkcpn2w22k6m7gxshk5x75hg8ql9cmja89v0birsn0f"; + }; + meta.homepage = "https://github.com/SidOfc/mkdx/"; + }; + molokai = buildVimPluginFrom2Nix { pname = "molokai"; version = "2015-11-11"; @@ -2544,12 +2568,12 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2020-12-03"; + version = "2020-12-11"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "f02686f2f60fd9cfb18976f12d791c2663cf17c8"; - sha256 = "023ra0nilvsrpcs7dv8dgfgk32cgbgiv75zpv6rmp91x119rp5fg"; + rev = "119b99d1662113a588734e3666213d246e50900d"; + sha256 = "1dci0a5hcpvx567vqns7csn7p24i2m2l3ra8jmcvwrhlk72kvgrf"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -2712,12 +2736,12 @@ let nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2020-12-08"; + version = "2020-12-14"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "9dca0299b9275daee6c1a1b7520014b2327f79e0"; - sha256 = "1mmas0fi6vyg68l0x6h4gaxv0bhpf9l4l16hl3ppg2lsqy544bs4"; + rev = "e9733ce739c4c8659226ebf0b2aa26bc1d10f3c1"; + sha256 = "0kl5ph1yxb5hhcyn78f70xglssrj0w3k9kwq13fxhi1lms15mvg2"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -2736,12 +2760,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2020-12-09"; + version = "2020-12-14"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "0d919bc5f9b358a7a8a20df18dbc0d3a018e4c73"; - sha256 = "0w2qdsisb02h4jnbxxa2lpxc6x3v8ribz3ka4bidrcmlnd7jbmrs"; + rev = "afe4a78021568578ec750e4fc398050a720f1815"; + sha256 = "1vnl5vaqxs04j084gnxk5ayx4q9ibf7la0iiwpryl57csxpvc5lm"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -2772,24 +2796,24 @@ let nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2020-12-07"; + version = "2020-12-16"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "2cec5892d7933be90b0207373733d793beaef1a1"; - sha256 = "0dvl4x5fjq4w0pcxbbfxhlmijd6casvh1jihpaqzb95n0mys6fny"; + rev = "bc8245c7bb57059ced9d957d9f15f56957656807"; + sha256 = "1lnbi746c5zhjlwsqbchhy8pna8d9drg7yi2jwsagj4jr2n4knwa"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-12-09"; + version = "2020-12-16"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "76486942e79973095795e8699f95bb509e063d0d"; - sha256 = "04qjyrkbrc1fcm5l1fra64z8qg8s30pr9ms05fgsprs2cacmg7wx"; + rev = "775021cbd5a5c242af74ee0892d3678971b5452b"; + sha256 = "1rsf19vpnbk4vs5a8kzbq3s8svvnf7kbrkswb1hy9qrfp94zmdvi"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -2820,24 +2844,24 @@ let nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2020-12-03"; + version = "2020-12-13"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "af6c04593e15abcc462389420ba33b9a631ccfbf"; - sha256 = "187yjwqk5s6cs8lxrkd943jc5hda0fn69yv9srvvjz5w24rl41g5"; + rev = "8743e233c22092e5ced954267eaa1e5d9b12e881"; + sha256 = "1qqy3qxqq8qijxq4mg0703x3gx92kccb1h47xrsp49crjpw1g8z1"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2020-11-30"; + version = "2020-12-15"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "a17dc0244045239f323b237b7c30d3ef7597b346"; - sha256 = "02gnicvrbrl6d09zmxn7r34j7g1mdsdaw7w51qpgddm7p295qaqi"; + rev = "7887fe8847c5c2ad67bd05c1da3f6613ee30bd8d"; + sha256 = "00030lnb80h7yrjdjz1pzwxg2gcp6kfjj9glckk5zl4sjk5gp31j"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -2892,12 +2916,12 @@ let onedark-vim = buildVimPluginFrom2Nix { pname = "onedark-vim"; - version = "2020-12-01"; + version = "2020-12-14"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "935016df2693590cb4fd2264c7ca9b129fae200c"; - sha256 = "0h7682ky6925sk50synk8yhbhbkvc3vka84vjz0nv0vwr1kd9qz6"; + rev = "94ff495eac89cea2532d8e0022f67c79a24d9649"; + sha256 = "0x4wdmk28r85g14xv1acc0fimh4bsvm30mrgsws7dm8lqx3ws8g3"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; @@ -3024,12 +3048,12 @@ let plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2020-12-09"; + version = "2020-12-16"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "db44551d6c6db27b796eeb6d24615e176504c8da"; - sha256 = "09zf57czrzwjmnsbny20wzsxqix1vn5sidblryml95g7q89dzx7x"; + rev = "2c7d9031eea13e50818f94118a5cdd30692feafa"; + sha256 = "1vx0l3p44ycqhy1mkdz47j64bdakq77hlda2zldbcfshxlmsb6rb"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3048,24 +3072,25 @@ let popfix = buildVimPluginFrom2Nix { pname = "popfix"; - version = "2020-12-06"; + version = "2020-12-16"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "popfix"; - rev = "2b0a2dfae0b32d218b1dbcacb72035b6c68067c7"; - sha256 = "1vg337p85cn2rknw9kxbjm750bwjrg61272yf8p2ncm8apfgnzjg"; + rev = "e610f0ec1639f28e9efb87b16f7fbf9c0e90d141"; + sha256 = "18hf65fwxl3m3gf8pi5j3dnphnqki3wz59ld3fqbq9720cfrcs2y"; + fetchSubmodules = true; }; meta.homepage = "https://github.com/RishabhRD/popfix/"; }; popup-nvim = buildVimPluginFrom2Nix { pname = "popup-nvim"; - version = "2020-10-08"; + version = "2020-12-12"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "popup.nvim"; - rev = "8f128cc7b2a1d759ce343ef92ea311526c6bbe13"; - sha256 = "1jxy6lp7r1wvd296x4ql6c9w43iwdwaf8jzyg5azs3x9cdyx9b73"; + rev = "6f8f4cf35278956de1095b0d10701c6b579a2a57"; + sha256 = "0mvcms1ica4kpl5na0cppk0advyq96707zj394wvlnnq18dnsj4z"; }; meta.homepage = "https://github.com/nvim-lua/popup.nvim/"; }; @@ -3540,17 +3565,29 @@ let splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2020-12-04"; + version = "2020-12-15"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "680aff68e0848dcfd5c33f886cabd7c9755b29e0"; - sha256 = "1h29g177fx9yp7hzw0vy94wf5flcw8q9iicwirpg5cvda8kx7i2w"; + rev = "91ba14b41f6e767414d7bf2a8e82947c6bfdb978"; + sha256 = "0q01xfnjqk3vnmknb01zlkzn1jj03lqsygk863vwrdazq86g5aci"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; }; + srcery-vim = buildVimPluginFrom2Nix { + pname = "srcery-vim"; + version = "2020-10-26"; + src = fetchFromGitHub { + owner = "srcery-colors"; + repo = "srcery-vim"; + rev = "ecbd5ba9055ad6b78dc47ef4f0894a7da63215f7"; + sha256 = "1ynyllw0fg4gfb5qcmwfjsqg5dr3dwfc5hya261zzd8a42qab1y4"; + }; + meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; + }; + starsearch-vim = buildVimPluginFrom2Nix { pname = "starsearch-vim"; version = "2014-09-21"; @@ -3709,12 +3746,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2020-12-09"; + version = "2020-12-16"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "c276db06e2981416995450a4198cef4b87170f6f"; - sha256 = "002n8zy19y8pya5rw7y18bwikd7rgb1229wlyv96mrifrr89hymh"; + rev = "b5ff9de13d4b15e78e9d3433d6bf085601f62a5d"; + sha256 = "1ckb1ka1wp8m859xdbvzhh52gq4i3j5qia4w6mcz78x358mknp6x"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -3854,12 +3891,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2020-11-23"; + version = "2020-12-14"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "8554371b57c8989cf73f73f288c456fb3f2a3a3a"; - sha256 = "0v3gyql3br11rl6ycl7i3zkx8kkc5f2w075y6cm6cslb9v124h6q"; + rev = "c270950492d71bac0317d47d42cd0884eefe6490"; + sha256 = "1k58wp6y6i0xr4pnp2h7r31229ngp3zadyi374c5nlf2pa3zc1d8"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -4430,12 +4467,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-12-07"; + version = "2020-12-16"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "7fbe0ac17fc70a4929f73612c0c092e0378937fc"; - sha256 = "0k5ic1dff90l5lc45zcahy7h28k837sc0mywsjjw9a3vdr2naqxd"; + rev = "af939a85cc78c9974dcf202a95ff8793755d575d"; + sha256 = "1kcnj0jqbag62gvxrr54hmri5qpskfs0i0l2m8z4ffliixy0mkan"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4682,12 +4719,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-12-01"; + version = "2020-12-10"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "7bfc9bb4a3f6c23cbb24ee8862dc60cf6ab9297c"; - sha256 = "0ip2p266b0f0f78q4rgwfy97fqwy4iw39rlfy40gr4gsn2ia76pb"; + rev = "0d0bd57246b3285caec4737dc0f1c6b17ebb2787"; + sha256 = "1kkc3hgfz0qr84r873gjmjhgwph0nhyan6v69b55ph5qqsksrl42"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -4886,12 +4923,12 @@ let vim-exchange = buildVimPluginFrom2Nix { pname = "vim-exchange"; - version = "2020-11-15"; + version = "2020-12-16"; src = fetchFromGitHub { owner = "tommcdo"; repo = "vim-exchange"; - rev = "13d3895709277d7b35bb4e30cc6ad0409a30ff0a"; - sha256 = "0fgdqbkpk4220q1l00c7wcim24pbpxqj30lcfid2afkf953zhzhp"; + rev = "17f1a2cc0d009cfd7f0dcda06dd0f017fcc1c70b"; + sha256 = "0c4s9cmyx1myqz9k35waply2mv0yr3agpkv64ndhwgqbmlxyifnj"; }; meta.homepage = "https://github.com/tommcdo/vim-exchange/"; }; @@ -5102,12 +5139,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-11-25"; + version = "2020-12-11"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "dfe55e2b924b86c654b63edb9bedc42aa4e08048"; - sha256 = "1b725iv0d2bgd2dqfjb36ifv1y5q4kybz4sj7vm3arvyqr0ly5j1"; + rev = "512e2999ed7ff367580e0d6bc4d2daa81663221f"; + sha256 = "0229x71prknra1k2val78qpddy6w7wmla2j6cjk8fjvp1h2jvwxz"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -5138,12 +5175,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-12-05"; + version = "2020-12-12"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "fa406d940636cc774bc6018df3b0fd591f6478ba"; - sha256 = "02djm695libpas4911qris4vbxwl6fhjzls7rda6wdvazdi7d3vy"; + rev = "2855115efb1dd8a5f4436a80138633a1cb5d9f0c"; + sha256 = "1clq50v9r0mdgvpg3qclrs1ar5939fmi9y8ajpdhi8akwmzwq2z2"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5391,12 +5428,12 @@ let vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2020-11-16"; + version = "2020-12-13"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "1d2ec93a4d08106daf0fd85cee459488deb57436"; - sha256 = "16nvxr4xvg4r42j4dc91f9p26msksmg5zha95fwf9g84bnsbz98j"; + rev = "b4a95300782781e2c27611e3bdeaadf2a8e75e56"; + sha256 = "1zabzl6zsxl2q60ipsrig3289l4gsglyf0w77vgfl0sxbhh3ii2q"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -5535,12 +5572,12 @@ let vim-jsbeautify = buildVimPluginFrom2Nix { pname = "vim-jsbeautify"; - version = "2019-10-18"; + version = "2020-12-11"; src = fetchFromGitHub { owner = "maksimr"; repo = "vim-jsbeautify"; - rev = "6003f9d420d56b91f5664ec5ed5a9a3a6d8df22b"; - sha256 = "06gxmqyxkw2mgdy6m7b248w0gzkwsjcpyihpnyf5cajb5aw4wk13"; + rev = "e4586884c8e54218a92d66f2ebc3fefc46315057"; + sha256 = "0l6z6063cddwlsmz8h2ayz3pblfbvn277javi80xfzxg84nfl6ip"; fetchSubmodules = true; }; meta.homepage = "https://github.com/maksimr/vim-jsbeautify/"; @@ -5702,6 +5739,18 @@ let meta.homepage = "https://github.com/ledger/vim-ledger/"; }; + vim-lightline-coc = buildVimPluginFrom2Nix { + pname = "vim-lightline-coc"; + version = "2020-11-15"; + src = fetchFromGitHub { + owner = "josa42"; + repo = "vim-lightline-coc"; + rev = "92a32b37ac1039ba39a451bd928bc62a316f0a7a"; + sha256 = "1qwim9y20ffn6dx4s69389w4d2c0rwlp7ri2pxhfb6bgyvibrc3s"; + }; + meta.homepage = "https://github.com/josa42/vim-lightline-coc/"; + }; + vim-lion = buildVimPluginFrom2Nix { pname = "vim-lion"; version = "2020-07-18"; @@ -5764,12 +5813,12 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2020-11-26"; + version = "2020-12-13"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "a56304f238f5368ad6c1b3b14b96308edd25a1f9"; - sha256 = "164sbwv6y9sf3isxp08zz1w05nz6aas63z1ib146di2r6wkslx57"; + rev = "9dce8c50ed845b1f68d03875007c0a8a47b5490a"; + sha256 = "0csvrd52i9cd2vwkc0rfsi598zi217kg67w87yjmh9v16bjjdmb4"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -6053,12 +6102,12 @@ let vim-nong-theme = buildVimPluginFrom2Nix { pname = "vim-nong-theme"; - version = "2020-12-03"; + version = "2020-12-16"; src = fetchFromGitHub { owner = "fruit-in"; repo = "vim-nong-theme"; - rev = "ea4c8558970b2c6e724483e3031940906420aa7e"; - sha256 = "09ws0wj2zldyfn7752rzh0wx24271yi4c390gd9f60d33pkc0s80"; + rev = "cf7eacc6140ef67f7fc6b3099a6ef82767af82e0"; + sha256 = "17lvmszydpgn54n54z4mhcipzrwxggnq7lr69k8vwbwmrr8sk0qa"; }; meta.homepage = "https://github.com/fruit-in/vim-nong-theme/"; }; @@ -6101,12 +6150,12 @@ let vim-one = buildVimPluginFrom2Nix { pname = "vim-one"; - version = "2020-08-09"; + version = "2020-12-14"; src = fetchFromGitHub { owner = "rakr"; repo = "vim-one"; - rev = "f8bcef1968f01842d92abbcb098ec28ad3931ea5"; - sha256 = "12czxjh68hdnca4wdk9ypd5c56v1njv6wc2bcxqaj1ff09pgllmy"; + rev = "187f5c85b682c1933f8780d4d419c55d26a82e24"; + sha256 = "0lnfw15p865hcnnjcaikf2xwfiqwidsqryq67j1bh74215ib8r10"; }; meta.homepage = "https://github.com/rakr/vim-one/"; }; @@ -6329,12 +6378,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-12-03"; + version = "2020-12-14"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "5430b6213a5c6c3bafd7e25b1e80ccb2afd7f5ba"; - sha256 = "1jzf6wbvwhvm3vjn6rlwic4s9niin6kap5lzi2xpip7yl809wz5x"; + rev = "8b45742540f92ba902c97ad1d3d8862ba3305438"; + sha256 = "0ashl6qixnhgj5pnss9ri8w7fzixcsd0h4cmb2jpfrfma8s7xn3b"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -6641,12 +6690,12 @@ let vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2020-07-27"; + version = "2020-12-15"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "f0bb324395bf6e00ec17fc7af60d2ccb8d494595"; - sha256 = "19fqpccvawh2wjkzgp64jijq4nnhirmgvrrycxzcx7lj612mbpmc"; + rev = "9e6340affe9f53c11a6975a5f50b9bf48adb692c"; + sha256 = "0ghli93qzr3i8ai90waikylwas3xgy5bdgykng55b9mqgpmc3faf"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -6809,24 +6858,24 @@ let vim-smoothie = buildVimPluginFrom2Nix { pname = "vim-smoothie"; - version = "2020-11-22"; + version = "2020-12-13"; src = fetchFromGitHub { owner = "psliwka"; repo = "vim-smoothie"; - rev = "f3120afee5ee7cca5f3ccc2bac0933125d0a1efc"; - sha256 = "0ndvs48g68ygminnrjis847qcf7zi7mafhnjzvdz9x8kly2jp7pc"; + rev = "a0414d1203e55d21b2b81050173c1c76bf0f854f"; + sha256 = "1ixz25fbdzcip324h9mkkmdfrwk3f0fqafrs5cnzmk5bcg9c22rv"; }; meta.homepage = "https://github.com/psliwka/vim-smoothie/"; }; vim-smt2 = buildVimPluginFrom2Nix { pname = "vim-smt2"; - version = "2018-05-20"; + version = "2020-12-14"; src = fetchFromGitHub { owner = "bohlender"; repo = "vim-smt2"; - rev = "9582e37b1dfd75621e51a3ac2275b6c6c895317f"; - sha256 = "0cas6c3pj55qhbcy2vaygg8l9gncjshi1g0a54l78x73d3y3wm03"; + rev = "aea240223698b4bb424d29805fe6750bb30872cb"; + sha256 = "15yxd4zxs738h51g10hx8xcki7r2hkb83prydk6g7sznsy3k70ia"; }; meta.homepage = "https://github.com/bohlender/vim-smt2/"; }; @@ -6857,12 +6906,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-11-26"; + version = "2020-12-14"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "6fe515ee5778c4a704b581b2b9ad0f13dd803c25"; - sha256 = "1ikfkvh1jkijhzf12zaymzs67r6snadzsd5qjz9ws4pax84hi82g"; + rev = "e7a8a3fb439e22a9d55b050f3cab5c962b8d5aa7"; + sha256 = "1s6xmyfkg2iqlgg3zgygfa3p3d2fbyinylffdn2iy384q0fjn7lw"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -7049,12 +7098,12 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2020-12-05"; + version = "2020-12-10"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "fcc3912658d0d0dff60975a487d17f919b94595c"; - sha256 = "1pf1hbs7ixyqyl3rvlmn8lgrbnix1x5qfrhk00ji4vnm7m4mcng5"; + rev = "aa7877acb5dd81bed70c1188667b76cfde5b67bf"; + sha256 = "0ibks0ykybiardppad9psjh2qmh29s9mbjf2d4jg8hbx59kvj32g"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -7422,12 +7471,12 @@ let vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2020-10-02"; + version = "2020-12-15"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "30c0810b012a7acdccc6b72f0e99c0388986844f"; - sha256 = "18rflksd58mwkq0lc64frfimj1l1k8cc0l45jpv0z4w118v92jyv"; + rev = "9d08a9416787ef0f3ede6ef9bc66f78cecf6d72b"; + sha256 = "1adb3r9iyni86k2hxrkj4hr7zdz0v9a1h84dn0yhjy1dwgwlxjrq"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -7554,12 +7603,12 @@ let VimOrganizer = buildVimPluginFrom2Nix { pname = "VimOrganizer"; - version = "2014-04-10"; + version = "2020-12-15"; src = fetchFromGitHub { owner = "hsitz"; repo = "VimOrganizer"; - rev = "cab0baf635eb9470e62d57d42f2d470180b06c8d"; - sha256 = "0qncr00xn7lj1i469fzjaaghhqrlyg5s2wj4v6625dhg98y0irix"; + rev = "09636aed78441a9de2767fcef6d7c567f322cc40"; + sha256 = "0phpcxmyz562yyp88rbx9pqg46w8r1lyapb700nvxwvqkcd82pfw"; }; meta.homepage = "https://github.com/hsitz/VimOrganizer/"; }; @@ -7626,12 +7675,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2020-12-05"; + version = "2020-12-14"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "2eb32f31533b79520ca6788fd41634525234d7e5"; - sha256 = "0zmllgk1wi8hbmrbgg300csg7q6km0pxichr9lagrxm7y4w3dnqg"; + rev = "61179b7670491a70b40cb34ddeefe793bee7fcb8"; + sha256 = "1gqfmvp1fzrj3zl21viqamjvfhjxw2qxs7ssvwblv3jympm27aww"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -7639,12 +7688,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-12-09"; + version = "2020-12-12"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "b3f0bdac24434b3d41738c2b797018e8c6277f86"; - sha256 = "11l4rcrkmcmibyrkan1lirak910dd50m3g6cdgwpi9k4r1lp67jf"; + rev = "83f4b63d4043aeb808c8cdc01f883c9a95446530"; + sha256 = "10d72r81m2cr4vzp61l8kg9bcpkrwbbx7wqxicqj1j00xln7p29i"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7687,12 +7736,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-11-21"; + version = "2020-12-12"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "d77828b043d980b99e386840d57629f6499e9995"; - sha256 = "084sy17xlly63m06pxb926rs4j3r1vqij2q7r815daaclsapmvq3"; + rev = "3a1809ccf01b6acffdc2d5c529a946961266c4d7"; + sha256 = "12n7i5n2if4daafxwnnbnglq4g2gvcx2zsa973cs3fj2jjx0fqvg"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -7820,12 +7869,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-11-27"; + version = "2020-12-16"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "4496153a3efdb0891dac24510ac1ee519f1778a6"; - sha256 = "0j2mzq726fly457j8fjbvijgg50l497qbp6lq0vpfbiz4b3hm46k"; + rev = "e252f6512f1f4a9a515dfc42401baf30a5fe72c8"; + sha256 = "0f0jrap8ivrywkzc7rwy27p6ssa5kll26df251ipsg1frmc7fmjm"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 0a9872a605a1a..c559a73b5b522 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -121,6 +121,7 @@ flazz/vim-colorschemes floobits/floobits-neovim freitass/todo.txt-vim frigoeu/psc-ide-vim +fruit-in/brainfuck-vim fruit-in/vim-nong-theme fsharp/vim-fsharp fszymanski/deoplete-emoji @@ -200,6 +201,7 @@ jnurmine/zenburn jonbri/vim-colorstepper jonsmithers/vim-html-template-literals joonty/vim-xdebug +josa42/vim-lightline-coc joshdick/onedark.vim jpalardy/vim-slime@main jparise/vim-graphql @@ -495,6 +497,7 @@ Shougo/vimproc.vim Shougo/vimshell.vim shumphrey/fugitive-gitlab.vim sickill/vim-pasta +SidOfc/mkdx simnalamburt/vim-mundo SirVer/ultisnips sjl/gundo.vim @@ -505,6 +508,7 @@ sodapopcan/vim-twiggy solarnz/arcanist.vim sonph/onehalf steelsojka/completion-buffers +srcery-colors/srcery-vim stefandtw/quickfix-reflector.vim stephpy/vim-yaml sunaku/vim-dasht diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 3c5427340baf8..b1d85f2674cbf 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, alsa-ucm-conf, alsa-topology-conf }: stdenv.mkDerivation rec { - name = "alsa-lib-1.2.3"; + pname = "alsa-lib"; + version = "1.2.4"; src = fetchurl { - url = "mirror://alsa/lib/${name}.tar.bz2"; - sha256 = "13k7dx1g749z74rz71hs5j8z0pqdjgx7l69pn0vsy7jizhi0kw02"; + url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; + sha256 = "sha256-91VL4aVs3/RotY/BwpuVtkhkxZADjdMJx6l4xxFpCPc="; }; patches = [ diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 64fa92be86583..3ce310acf231b 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -14,7 +14,7 @@ let apparmor-series = "2.13"; - apparmor-patchver = "5"; + apparmor-patchver = "6"; apparmor-version = apparmor-series + "." + apparmor-patchver; apparmor-meta = component: with stdenv.lib; { @@ -27,7 +27,7 @@ let apparmor-sources = fetchurl { url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; - sha256 = "05x7r99k00r97v1cq2f711lv6yqzhbl8zp1i1c7kxra4v0a2lzk3"; + sha256 = "13xshy7905d9q9n8d8i0jmdi9m36wr525g4wlsp8k21n7yvvh9j4"; }; prePatchCommon = '' diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 0d8392cbcd8a8..7557497b959e5 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -1,22 +1,24 @@ {stdenv, fetchurl, zlib, ncurses}: stdenv.mkDerivation rec { - version = "2.4.0"; pname = "atop"; + version = "2.6.0"; src = fetchurl { url = "https://www.atoptool.nl/download/atop-${version}.tar.gz"; - sha256 = "0s9xlxlzz688a80zxld840zkrmzw998rdkkg6yc7ssq8fw50275y"; + sha256 = "nsLKOlcWkvfvqglfmaUQZDK8txzCLNbElZfvBIEFj3I="; }; buildInputs = [zlib ncurses]; makeFlags = [ - ''SCRPATH=$out/etc/atop'' - ''LOGPATH=/var/log/atop'' - ''INIPATH=$out/etc/rc.d/init.d'' - ''CRNPATH=$out/etc/cron.d'' - ''ROTPATH=$out/etc/logrotate.d'' + "SCRPATH=$out/etc/atop" + "LOGPATH=/var/log/atop" + "INIPATH=$out/etc/rc.d/init.d" + "SYSDPATH=$out/lib/systemd/system" + "CRNPATH=$out/etc/cron.d" + "DEFPATH=$out/etc/default" + "ROTPATH=$out/etc/logrotate.d" ]; preConfigure = '' @@ -28,9 +30,9 @@ stdenv.mkDerivation rec { sed -e 's/chmod 04711/chmod 0711/g' -i Makefile ''; + installTargets = [ "systemdinstall" ]; preInstall = '' mkdir -p "$out"/{bin,sbin} - make systemdinstall $makeFlags ''; meta = with stdenv.lib; { @@ -42,7 +44,7 @@ stdenv.mkDerivation rec { Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process activity for long-term analysis, highlighting overloaded system resources by using colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, swap, disks and network layers, and for every active process it shows the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code. ''; inherit version; - license = licenses.gpl2; + license = licenses.gpl2Plus; downloadPage = "http://atoptool.nl/downloadatop.php"; }; } diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index 762baa5871126..6d919ce57d4f0 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig -, python3, boost, fuse, libtorrentRasterbar, curl }: +, python3, boost, fuse, libtorrent-rasterbar, curl }: stdenv.mkDerivation rec { pname = "btfs"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ - boost fuse libtorrentRasterbar curl python3 + boost fuse libtorrent-rasterbar curl python3 ]; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/cpuset/default.nix b/pkgs/os-specific/linux/cpuset/default.nix index 90352a944d5bd..9e775de62f585 100644 --- a/pkgs/os-specific/linux/cpuset/default.nix +++ b/pkgs/os-specific/linux/cpuset/default.nix @@ -1,27 +1,44 @@ { stdenv , fetchFromGitHub -, python2Packages +, fetchpatch +, pythonPackages }: -python2Packages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { pname = "cpuset"; - version = "1.5.8"; + version = "1.6"; - propagatedBuildInputs = [ ]; + propagatedBuildInputs = with pythonPackages; [ + configparser + future + ]; + + # https://github.com/lpechacek/cpuset/pull/36 + patches = [ + (fetchpatch { + url = "https://github.com/MawKKe/cpuset/commit/a4b6b275d0a43d2794ab9e82922d3431aeea9903.patch"; + sha256 = "1mi1xrql81iczl67s4dk2rm9r1mk36qhsa19wn7zgryf95krsix2"; + }) + ]; makeFlags = [ "prefix=$(out)" ]; src = fetchFromGitHub { - owner = "wykurz"; + owner = "lpechacek"; repo = "cpuset"; rev = "v${version}"; - sha256 = "19fl2sn470yrnm2q508giggjwy5b6r2gd94gvwfbdlhf0r9dsbbm"; + sha256 = "0ig0ml2zd5542d0989872vmy7cs3qg7nxwa93k42bdkm50amhar4"; }; + checkPhase = '' + cd t + make + ''; + meta = with stdenv.lib; { description = "Python application that forms a wrapper around the standard Linux filesystem calls to make using the cpusets facilities in the Linux kernel easier"; - homepage = "https://github.com/wykurz/cpuset"; + homepage = "https://github.com/lpechacek/cpuset"; license = licenses.gpl2; - maintainers = with maintainers; [ wykurz ]; + maintainers = with maintainers; [ thiagokokada wykurz ]; }; } diff --git a/pkgs/os-specific/linux/displaylink/99-displaylink.rules b/pkgs/os-specific/linux/displaylink/99-displaylink.rules new file mode 100644 index 0000000000000..ceeb658a415a1 --- /dev/null +++ b/pkgs/os-specific/linux/displaylink/99-displaylink.rules @@ -0,0 +1 @@ +ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="17e9", ATTR{bInterfaceClass}=="ff", ATTR{bInterfaceProtocol}=="03", TAG+="systemd", ENV{SYSTEMD_WANTS}="dlm.service" diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index dcdafb98d707d..5e60d68bc2bbf 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -1,6 +1,14 @@ -{ stdenv, lib, unzip, util-linux, - libusb1, evdi, systemd, makeWrapper, requireFile, substituteAll }: - +{ stdenv +, lib +, unzip +, util-linux +, libusb1 +, evdi +, systemd +, makeWrapper +, requireFile +, substituteAll +}: let arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" @@ -9,7 +17,8 @@ let bins = "${arch}-ubuntu-1604"; libPath = lib.makeLibraryPath [ stdenv.cc.cc util-linux libusb1 evdi ]; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "displaylink"; version = "5.3.1.34"; @@ -39,20 +48,11 @@ in stdenv.mkDerivation rec { ./displaylink-driver-${version}.run --target . --noexec --nodiskspace ''; - patches = [ (substituteAll { - src = ./udev-installer.patch; - inherit systemd; - })]; - installPhase = '' - sed -i "s,/opt/displaylink/udev.sh,$out/lib/udev/displaylink.sh,g" udev-installer.sh - ( source udev-installer.sh - mkdir -p $out/lib/udev/rules.d - main systemd "$out/lib/udev/rules.d/99-displaylink.rules" "$out/lib/udev/displaylink.sh" - ) - install -Dt $out/lib/displaylink *.spkg install -Dm755 ${bins}/DisplayLinkManager $out/bin/DisplayLinkManager + mkdir -p $out/lib/udev/rules.d + cp ${./99-displaylink.rules} $out/lib/udev/rules.d/99-displaylink.rules patchelf \ --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ --set-rpath ${libPath} \ diff --git a/pkgs/os-specific/linux/displaylink/udev-installer.patch b/pkgs/os-specific/linux/displaylink/udev-installer.patch deleted file mode 100644 index 880c073fbcf62..0000000000000 --- a/pkgs/os-specific/linux/displaylink/udev-installer.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/udev-installer.sh 2018-12-09 12:05:53.772318942 +0100 -+++ b/udev-installer.sh 2018-12-09 12:06:19.939947629 +0100 -@@ -21,12 +21,12 @@ - cat <<'EOF' - start_service() - { -- systemctl start displaylink-driver -+ /run/current-system/systemd/bin/systemctl start --no-block dlm - } - - stop_service() - { -- systemctl stop displaylink-driver -+ /run/current-system/systemd/bin/systemctl stop dlm - } - - EOF - diff --git a/pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch b/pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch new file mode 100644 index 0000000000000..c2d844edecd12 --- /dev/null +++ b/pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch @@ -0,0 +1,84 @@ +From 55d499f4cd5667c04c21f7201d7f10484e187907 Mon Sep 17 00:00:00 2001 +From: Florian Klink <flokli@flokli.de> +Date: Sun, 27 Dec 2020 13:03:12 +0100 +Subject: [PATCH] unit/test-dbus: pick up dbus-daemon from $PATH + +This allows running the unit tests in environments where `dbus-daemon` +isn't in /usr/bin, but in $PATH. + +Signed-off-by: Florian Klink <flokli@flokli.de> +--- + unit/test-dbus-message-fds.c | 4 ++-- + unit/test-dbus-properties.c | 4 ++-- + unit/test-dbus.c | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/unit/test-dbus-message-fds.c b/unit/test-dbus-message-fds.c +index 6f68bae..4b5662e 100644 +--- a/unit/test-dbus-message-fds.c ++++ b/unit/test-dbus-message-fds.c +@@ -51,7 +51,7 @@ static bool start_dbus_daemon(void) + char *prg_envp[1]; + pid_t pid; + +- prg_argv[0] = "/usr/bin/dbus-daemon"; ++ prg_argv[0] = "dbus-daemon"; + prg_argv[1] = "--nopidfile"; + prg_argv[2] = "--nofork"; + prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; +@@ -68,7 +68,7 @@ static bool start_dbus_daemon(void) + } + + if (pid == 0) { +- execve(prg_argv[0], prg_argv, prg_envp); ++ execvpe(prg_argv[0], prg_argv, prg_envp); + exit(EXIT_SUCCESS); + } + +diff --git a/unit/test-dbus-properties.c b/unit/test-dbus-properties.c +index b435062..049f0f4 100644 +--- a/unit/test-dbus-properties.c ++++ b/unit/test-dbus-properties.c +@@ -49,7 +49,7 @@ static bool start_dbus_daemon(void) + char *prg_envp[1]; + pid_t pid; + +- prg_argv[0] = "/usr/bin/dbus-daemon"; ++ prg_argv[0] = "dbus-daemon"; + prg_argv[1] = "--nopidfile"; + prg_argv[2] = "--nofork"; + prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; +@@ -66,7 +66,7 @@ static bool start_dbus_daemon(void) + } + + if (pid == 0) { +- execve(prg_argv[0], prg_argv, prg_envp); ++ execvpe(prg_argv[0], prg_argv, prg_envp); + exit(EXIT_SUCCESS); + } + +diff --git a/unit/test-dbus.c b/unit/test-dbus.c +index 67f0a7b..582847e 100644 +--- a/unit/test-dbus.c ++++ b/unit/test-dbus.c +@@ -45,7 +45,7 @@ static void start_dbus_daemon(void) + char *prg_envp[1]; + pid_t pid; + +- prg_argv[0] = "/usr/bin/dbus-daemon"; ++ prg_argv[0] = "dbus-daemon"; + prg_argv[1] = "--nopidfile"; + prg_argv[2] = "--nofork"; + prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; +@@ -62,7 +62,7 @@ static void start_dbus_daemon(void) + } + + if (pid == 0) { +- execve(prg_argv[0], prg_argv, prg_envp); ++ execvpe(prg_argv[0], prg_argv, prg_envp); + exit(EXIT_SUCCESS); + } + +-- +2.29.2 + diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 21f98889ca574..c6aed21cd8e81 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -12,13 +12,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchgit { - url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; - rev = version; - sha256 = "16z7xwlrpx1bsr2y1rgxxxixzwc84cwn2g557iqxhwsxfzy6q3dk"; + url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; + rev = version; + sha256 = "16z7xwlrpx1bsr2y1rgxxxixzwc84cwn2g557iqxhwsxfzy6q3dk"; }; patches = [ - ./fix-dbus-tests.patch + # Sent upstream in https://lists.01.org/hyperkitty/list/ell@lists.01.org/thread/SQEZAIS2LZXSXGTXOW3GTAM5ZPXRLTN4/ + ./0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch ]; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/ell/fix-dbus-tests.patch b/pkgs/os-specific/linux/ell/fix-dbus-tests.patch deleted file mode 100644 index b494ba8b43c93..0000000000000 --- a/pkgs/os-specific/linux/ell/fix-dbus-tests.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -140,6 +140,7 @@ - ell_libell_private_la_SOURCES = $(ell_libell_la_SOURCES) - - AM_CFLAGS = -fvisibility=hidden -DUNITDIR=\""$(top_srcdir)/unit/"\" \ -+ -DDBUS_DAEMON=\""$(DBUS_DAEMONDIR)/dbus-daemon"\" \ - -DCERTDIR=\""$(top_builddir)/unit/"\" - - pkgconfigdir = $(libdir)/pkgconfig ---- a/configure.ac -+++ b/configure.ac -@@ -14,6 +14,8 @@ - - AC_PREFIX_DEFAULT(/usr/local) - -+PKG_PROG_PKG_CONFIG -+ - COMPILER_FLAGS - - AC_LANG_C -@@ -131,6 +133,10 @@ - AC_CHECK_PROG(have_xxd, [xxd], [yes], [no]) - fi - -+PKG_CHECK_MODULES(DBUS, dbus-1, dummy=yes, -+ AC_MSG_ERROR(D-Bus is required for running tests)) -+PKG_CHECK_VAR(DBUS_DAEMONDIR, dbus-1, daemondir) -+ - AM_CONDITIONAL(DBUS_TESTS, test "${little_endian}" = "yes") - AM_CONDITIONAL(CERT_TESTS, test "${have_openssl}" = "yes") - ---- a/unit/test-dbus-message-fds.c -+++ b/unit/test-dbus-message-fds.c -@@ -51,7 +51,7 @@ - char *prg_envp[1]; - pid_t pid; - -- prg_argv[0] = "/usr/bin/dbus-daemon"; -+ prg_argv[0] = DBUS_DAEMON; - prg_argv[1] = "--nopidfile"; - prg_argv[2] = "--nofork"; - prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; ---- a/unit/test-dbus-properties.c -+++ b/unit/test-dbus-properties.c -@@ -48,7 +48,7 @@ - char *prg_envp[1]; - pid_t pid; - -- prg_argv[0] = "/usr/bin/dbus-daemon"; -+ prg_argv[0] = DBUS_DAEMON; - prg_argv[1] = "--nopidfile"; - prg_argv[2] = "--nofork"; - prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; ---- a/unit/test-dbus.c -+++ b/unit/test-dbus.c -@@ -45,7 +45,7 @@ - char *prg_envp[1]; - pid_t pid; - -- prg_argv[0] = "/usr/bin/dbus-daemon"; -+ prg_argv[0] = DBUS_DAEMON; - prg_argv[1] = "--nopidfile"; - prg_argv[2] = "--nofork"; - prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index b672dd170122c..2f06e99b3e136 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { - version = "2.2.11"; + version = "2.3.0"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - sha256 = "06ajhs6byw3pj0skix6ppmdjsg1a3zan8yamnjqdgkxwliiszhrc"; + sha256 = "sha256-ho6yKCgYo3p50leQUCmzNO/3wqzSzs27Eash3AWBaiE="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 119ba22ca2642..986bb402e57ff 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "evdi"; - version = "unstable-20200416"; + version = "v1.7.2"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; - rev = "dc595db636845aef39490496bc075f6bf067106c"; - sha256 = "1yrny6jj9403z0rxbd3nxf49xc4w0rfpl7xsq03pq32pb3vlbqw7"; + rev = version; + sha256 = "074j0xh037n8mc4isihfz9lap57wvxaxib32pvy6jhjl3wyik632"; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index ca4984257212d..6eaa58f353a1f 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "eventstat"; - version = "0.04.10"; + version = "0.04.11"; src = fetchzip { url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz"; - sha256 = "0rmg49m56qxji7gwci03pkk4f4hnaq1n2x1348dqkaf5zs5nhi6b"; + sha256 = "0hsi5w8dmqwwdahnqvs83bam3j1cagw1ggm06d35dfwy5xknc5i4"; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index 233386847649a..1a432eb768c94 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation { pname = "raspberrypi-wireless-firmware"; - version = "2019-08-16"; + version = "2020-12-01"; srcs = [ (fetchFromGitHub { name = "bluez-firmware"; owner = "RPi-Distro"; repo = "bluez-firmware"; - rev = "96eefffcccc725425fd83be5e0704a5c32b79e54"; - sha256 = "05h57gcxhb2c84h99cyxxx4mzi6kd5fm8pjqkz3nq5vs3nv8cqhr"; + rev = "1e4ee0c05bae10002124b56c0e44bb9ac6581ddc"; + sha256 = "10n6ibr3ra71f4hlvbpy8csjlgrapawxrr6jmijn470vkcqcpq27"; }) (fetchFromGitHub { name = "firmware-nonfree"; owner = "RPi-Distro"; repo = "firmware-nonfree"; - rev = "130cb86fa30cafbd575d38865fa546350d4c5f9c"; - sha256 = "0jmhgbpldzz8n8lncpzwfl5ym8zgss05y952rfpwcf9v5c7vgabx"; + rev = "b66ab26cebff689d0d3257f56912b9bb03c20567"; + sha256 = "0cffgsp0w7vv7ylpymdddx0bl9dx3pl7snlh30p4rr9srmn8869f"; }) ]; @@ -41,10 +41,10 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1r4alf1fbj6vkkf54d0anm47ymb6gn2ykl4a2hhd34b0hnf1dnhn"; + outputHash = "17k9y499kjc4zv7ivnsfrgfibwj0ldr3sqdgia4dackbr70jfg2h"; meta = with stdenv.lib; { - description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3 and Zero W"; + description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W"; homepage = "https://github.com/RPi-Distro/firmware-nonfree"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 70bcaa15d96ef..b5fa3909c3b10 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchFromGitHub }: +{ stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { + # NOTE: this should be updated with linux_rpi pname = "raspberrypi-firmware"; - version = "1.20201022"; + version = "1.20201201"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "0j5m50cmmr11m3h8kk89j1pqkdqr7mzdzg04ayiqvfhvy32qqlg8"; + sha256 = "09yha3k72yqx29rwnv2j2zm73lzc4jgmcbmcc6yrl1i07x84lx3n"; }; installPhase = '' @@ -16,9 +17,11 @@ stdenv.mkDerivation rec { cp -R boot/* $out/share/raspberrypi/boot ''; + dontConfigure = true; + dontBuild = true; dontFixup = true; - meta = with stdenv.lib; { + meta = with stdenvNoCC.lib; { description = "Firmware for the Raspberry Pi board"; homepage = "https://github.com/raspberrypi/firmware"; license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix deleted file mode 100644 index 6c4d49e4e2404..0000000000000 --- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig }: - -stdenv.mkDerivation { - pname = "raspberrypi-tools"; - version = "2020-05-28"; - - src = fetchFromGitHub { - owner = "raspberrypi"; - repo = "userland"; - rev = "f97b1af1b3e653f9da2c1a3643479bfd469e3b74"; - sha256 = "1r7n05rv96hqjq0rn0qzchmfqs0j7vh3p8jalgh66s6l0vms5mwy"; - }; - - nativeBuildInputs = [ cmake pkgconfig ]; - - preConfigure = '' - cmakeFlagsArray+=("-DVMCS_INSTALL_PREFIX=$out") - '' + stdenv.lib.optionalString stdenv.isAarch64 '' - cmakeFlagsArray+=("-DARM64=1") - ''; - - meta = with stdenv.lib; { - description = "Userland tools for the Raspberry Pi board"; - homepage = "https://github.com/raspberrypi/userland"; - license = licenses.bsd3; - platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ dezgeg tavyc ]; - }; -} diff --git a/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix new file mode 100644 index 0000000000000..4418722c7c45f --- /dev/null +++ b/pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "rtl8761b-firmware"; + + src = fetchFromGitHub { + owner = "Realtek-OpenSource"; + repo = "android_hardware_realtek"; + rev = "rtk1395"; + sha256 = "sha256-vd9sZP7PGY+cmnqVty3sZibg01w8+UNinv8X85B+dzc="; + }; + + installPhase = '' + install -D -pm644 \ + bt/rtkbt/Firmware/BT/rtl8761b_fw \ + $out/lib/firmware/rtl_bt/rtl8761b_fw.bin + + install -D -pm644 \ + bt/rtkbt/Firmware/BT/rtl8761b_config \ + $out/lib/firmware/rtl_bt/rtl8761b_config.bin + ''; + + meta = with stdenv.lib; { + description = "Firmware for Realtek RTL8761b"; + license = licenses.unfreeRedistributableFirmware; + maintainers = with maintainers; [ edibopp ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index e33a40e6a85f3..7b8c2197d706b 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "20.33.17675"; + version = "20.34.17727"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "1ckzspf05skdrjh947gv96finxbv5dpgc84hppm5pdsp5q70iyxp"; + sha256 = "19scbbr6jf3yp2v7z8xyzzm01g44jym7xfkf1dz64d5nhvjw6ig5"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 64ac3342acf21..0cbd7ff3a3ad4 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { sha256 = "0gzpdgfwzlqj2n3amf2zhi2hlpa412878yphgx79y6b5gn1y1lm2"; }; - outputs = [ "out" "man" "test" ]; + outputs = [ "out" "man" ] + ++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test"; nativeBuildInputs = [ autoreconfHook @@ -38,7 +39,9 @@ stdenv.mkDerivation rec { checkInputs = [ openssl ]; - pythonPath = [ + # wrapPython wraps the scripts in $test. They pull in gobject-introspection, + # which doesn't cross-compile. + pythonPath = stdenv.lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ python3Packages.dbus-python python3Packages.pygobject3 ]; @@ -61,11 +64,12 @@ stdenv.mkDerivation rec { doCheck = true; postInstall = '' - mkdir -p $test/bin - cp -a test/* $test/bin/ mkdir -p $out/share cp -a doc $out/share/ cp -a README AUTHORS TODO $out/share/doc/ + '' + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + mkdir -p $test/bin + cp -a test/* $test/bin/ ''; preFixup = '' diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c1f870e3d81e9..0ea36ce8f4405 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -10,13 +10,13 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.163.a/linux-hardened-4.19.163.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.83.a.patch", - "sha256": "08srahgfzynv2bfd0ym6vgl1c0xjfqg6qvgzlq85y9pb7fain5yp", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.83.a/linux-hardened-5.4.83.a.patch" + "name": "linux-hardened-5.4.85.a.patch", + "sha256": "1ml9vpakhpxry29c4q0fz346ly7s3hwd7rasr4dzkgs71lm5a1sy", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.85.a/linux-hardened-5.4.85.a.patch" }, "5.9": { - "name": "linux-hardened-5.9.14.a.patch", - "sha256": "1rr61s9k7nmr27r4vkgpvvra7r8ksi6h6axf5kcbx7krbgdmwmfv", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.14.a/linux-hardened-5.9.14.a.patch" + "name": "linux-hardened-5.9.16.a.patch", + "sha256": "024wdzc9bwgr4nd4z0l6bazcl35jczhsmdl2lb26bvffjwg207rw", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.16.a/linux-hardened-5.9.16.a.patch" } } diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index db7ff9c912a54..783e7cf2d9682 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 stdenv.lib; buildLinux (args // rec { - version = "5.10.1"; + version = "5.10.3"; # 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 = "0p2fl7kl4ckphq17xir7n7vgrzlhbdqmyd2yyp4yilwvih9625pd"; + sha256 = "09cml495fnf52lhlkjxjznw34q5s8arvq7shkb6wjq6fwlrk65gr"; }; } // (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 9e3ddaa871668..0d504ff334a46 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 stdenv.lib; buildLinux (args // rec { - version = "5.4.83"; + version = "5.4.85"; # 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 = "1ik14pfgynkn1sjhgyhgmxjvviq0mgvk0ygj76w8mplkpc5rgv5y"; + sha256 = "0220k327aa7gg48fqw171mcng8h717c4a1v14r3q36ksirnmiqqx"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix index c3fef2fdcde76..39cc9c56c5fcc 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.9.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.9.14"; + version = "5.9.16"; # 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 = "0jbb3rzbkh0l75zq9bnc60w55ryvrvcg7vw85fsbcwfzvi0zpz1r"; + sha256 = "11mbnjvb5d5gwbrwlkqvzpg1ij4m19l5wr3wca9iiyg5i2papmxh"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index baf2ca589aa58..a84828aa0c1af 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17788"; - sha256 = "0cjzsgg8cgqy5s3hsh1v5hspl2i64s45zhcszn04m6ibrm1sd4fk"; + rev = "17812"; + sha256 = "150rh6qakyfzr6afzchf7c05z0dvc39gj0rpfb4ggr7xqpzhxrcc"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix new file mode 100644 index 0000000000000..f27043789797c --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: + +let + version = "5.9.16"; +in + +buildLinux (args // { + modDirVersion = "${version}-lqx1"; + inherit version; + isZen = true; + + src = fetchFromGitHub { + owner = "zen-kernel"; + repo = "zen-kernel"; + rev = "v${version}-lqx1"; + sha256 = "0ljvqf91nxpql98z75bicg5y3nzkm41rq5b0rm1kcnsk0ji829ps"; + }; + + extraMeta = { + branch = "5.9/master"; + maintainers = with stdenv.lib.maintainers; [ atemu ]; + description = linux_zen.meta.description + " (Same as linux_zen but less aggressive release schedule)"; + }; + +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index a3d2bfd4836ce..176c2180f359c 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,8 +1,9 @@ { stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, rpiVersion, ... } @ args: let - modDirVersion = "4.19.118"; - tag = "1.20200601"; + # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this + modDirVersion = "5.4.79"; + tag = "1.20201201"; in lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; @@ -12,7 +13,7 @@ lib.overrideDerivation (buildLinux (args // { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "11jzsmnd1qry2ir9vmsv0nfdzjpgkn5yab5ylxcz406plc073anp"; + sha256 = "093p5kh5f27djkhbcw371w079lhhihvg3s4by3wzsd40di4fcgn9"; }; defconfig = { @@ -22,6 +23,11 @@ lib.overrideDerivation (buildLinux (args // { "4" = "bcm2711_defconfig"; }.${toString rpiVersion}; + extraConfig = '' + # ../drivers/pci/controller/pcie-altera.c:679:8: error: too few arguments to function 'devm_of_pci_get_host_bridge_resources' + PCIE_ALTERA n + ''; + features = { efiBootStub = false; } // (args.features or {}); diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 4eec6c431b6ca..07a74c1077115 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10-rt17"; # updated by ./update-rt.sh + version = "5.10.1-rt20"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0hyav21vzz5v1kgb455pcz9ncg5qqzxmp60na290scwq7vj9kpyw"; + sha256 = "0p2fl7kl4ckphq17xir7n7vgrzlhbdqmyd2yyp4yilwvih9625pd"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0baf7363f6h3smr4lgw88dbpf4977j6c1asifyhc8zhd7100ckhn"; + sha256 = "0z8ljfcn908hzjl11fkmwrx2r7j0hcgpx07g21ag162qrn6g5qby"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; 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 9f64abc55a02a..25e3172b0f3a6 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.82-rt45"; # updated by ./update-rt.sh + version = "5.4.84-rt47"; # 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 = "1byx163v83aw0ixphwz20znml2s2n3cy1kp89vgwbdiqxbj5hi7v"; + sha256 = "058mhczv6whjwxn7jjh1c6n5zrqjdnvbl2mp7jkfrg6frpvgr189"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0nh7d5b81br3cpljmn5n7lgn877h02aal95782hiflv7cmrb597r"; + sha256 = "0nccxf9l9ycvb782f48zrbl59vi674qq7yjyaks97440pgyd1jg0"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 81dcb5d4563b8..dd9ce3e080a38 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,14 +1,14 @@ { stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // { - version = "5.8.0-2020.09.07"; - modDirVersion = "5.8.0"; + version = "5.9.0-2020.11.20"; + modDirVersion = "5.9.0"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs"; - rev = "fb2821e72648f35d3cff61ac26041d634fd1dacf"; - sha256 = "0f9hx6fz27rm8h1lk9868v727klvyzcbw6hcgm5mypbfq1nqirdy"; + rev = "6a505b63ed3003faf5000f19fd08bbd477d93fbc"; + sha256 = "1rf34gzv9npafp1c3i6lymk3b0gnqp4rb0wl33pw6yrpgnsry3cc"; }; extraConfig = "BCACHEFS_FS m"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 5bf74ffd377b6..ac84e70bae48b 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,15 +3,15 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.10-rc6"; - extraMeta.branch = "5.10"; + version = "5.11-rc1"; + extraMeta.branch = "5.11"; # 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 = "14ykzs98r918sqv7lddlps4r7hza1zgw0x67mmj77cmqiv6d8ffi"; + sha256 = "sha256-nPJpz058khWE83QV9ITylTXjimBBw7SQwg7WBjWA7H0="; }; # 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 5ac81d6ebb94c..dc28f37338bd1 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.9.14"; + version = "5.10.1"; in buildLinux (args // { @@ -13,12 +13,13 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-zen1"; - sha256 = "1b8pm80z49d7qk9mvdf9w3hih34pilqr1zjk110q5im1kdz81zrg"; + sha256 = "1c77x53ixyn64b4qq6br6ckicmjs316c8k08yfxibmhv72av1wcp"; }; extraMeta = { - branch = "5.9/master"; + branch = "5.10/master"; maintainers = with stdenv.lib.maintainers; [ atemu andresilva ]; + description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads."; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index e2805c315b8bf..23c01d0419215 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -76,6 +76,13 @@ }; }; + # Adapted for Linux 5.4 from: + # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=04896832c94aae4842100cafb8d3a73e1bed3a45 + rtl8761b_support = + { name = "rtl8761b-support"; + patch = ./rtl8761b-support.patch; + }; + export_kernel_fpu_functions = { "4.14" = { name = "export_kernel_fpu_functions"; diff --git a/pkgs/os-specific/linux/kernel/rtl8761b-support.patch b/pkgs/os-specific/linux/kernel/rtl8761b-support.patch new file mode 100644 index 0000000000000..b6d80d5bc8d32 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/rtl8761b-support.patch @@ -0,0 +1,33 @@ +diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c +index 67f4bc21e7c5..3a9afc905f24 100644 +--- a/drivers/bluetooth/btrtl.c ++++ b/drivers/bluetooth/btrtl.c +@@ -130,12 +130,19 @@ static const struct id_table ic_id_table[] = { + .cfg_name = "rtl_bt/rtl8821c_config" }, + + /* 8761A */ +- { IC_MATCH_FL_LMPSUBV, RTL_ROM_LMP_8761A, 0x0, ++ { IC_INFO(RTL_ROM_LMP_8761A, 0xa), + .config_needed = false, + .has_rom_version = true, + .fw_name = "rtl_bt/rtl8761a_fw.bin", + .cfg_name = "rtl_bt/rtl8761a_config" }, + ++ /* 8761B */ ++ { IC_INFO(RTL_ROM_LMP_8761A, 0xb), ++ .config_needed = false, ++ .has_rom_version = true, ++ .fw_name = "rtl_bt/rtl8761b_fw.bin", ++ .cfg_name = "rtl_bt/rtl8761b_config" }, ++ + /* 8822C with USB interface */ + { IC_INFO(RTL_ROM_LMP_8822B, 0xc), + .config_needed = false, +@@ -251,6 +258,7 @@ static int rtlbt_parse_firmware(struct hci_dev *hdev, + { RTL_ROM_LMP_8723B, 9 }, /* 8723D */ + { RTL_ROM_LMP_8821A, 10 }, /* 8821C */ + { RTL_ROM_LMP_8822B, 13 }, /* 8822C */ ++ { RTL_ROM_LMP_8761A, 14 }, /* 8761B */ + }; + + min_size = sizeof(struct rtl_epatch_header) + sizeof(extension_sig) + 3; diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index fb06f942e482b..fe9cb46fb8a92 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { ./conf-symlink.patch ]; + makeFlags = stdenv.lib.optionals stdenv.hostPlatform.isStatic "NO_SOLIB=1"; + BUILDDATE = "1970-01-01"; outputs = [ "out" "lib" "dev" ]; diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/os-specific/linux/libpsm2/default.nix index b9e41380da8cd..501453b88216b 100644 --- a/pkgs/os-specific/linux/libpsm2/default.nix +++ b/pkgs/os-specific/linux/libpsm2/default.nix @@ -2,8 +2,7 @@ stdenv.mkDerivation rec { pname = "libpsm2"; - version = "11.2.156"; - ifs_version = "10_10_2_0_44"; + version = "11.2.185"; preConfigure= '' export UDEVDIR=$out/etc/udev @@ -14,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ numactl pkgconfig ]; - installFlags = [ + installFlags = [ "DESTDIR=$(out)" "UDEVDIR=/etc/udev" "LIBPSM2_COMPAT_CONF_DIR=/etc" @@ -23,8 +22,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "intel"; repo = "opa-psm2"; - rev = "IFS_RELEASE_${ifs_version}"; - sha256 = "0ckrfzih1ga9yvximxjdh0z05kn9l858ykqiblv18w6ka3gra1xz"; + rev = "PSM2_${version}"; + sha256 = "062hg4r6gz7pla9df70nqs5i2a3mp1wszmp4l0g771fykhhrxsjg"; }; postInstall = '' diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index e3407f8fe5f1a..b9af74906b49d 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -29,16 +29,20 @@ rec { } else legacy_390; - # No active beta right now - beta = stable; + beta = generic { + version = "460.27.04"; + sha256_64bit = "plTqtc5QZQwM0f3MeMZV0N5XOiuSXCCDklL/qyy8HM8="; + settingsSha256 = "hU9J0VSrLXs7N14zq6U5LbBLZXEIyTfih/Bj6eFcMf0="; + persistencedSha256 = "PmqhoPskqhJe2FxMrQh9zX1BWQCR2kkfDwvA89+XALA="; + }; # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "455.46.02"; + version = "455.46.04"; persistencedVersion = "455.45.01"; settingsVersion = "455.45.01"; - sha256_64bit = "05y4scg62mrhjnj2c8689m5hdyzqnx5p8vqvdqvv76zy970723l7"; + sha256_64bit = "1iv42w3x1vc00bgn6y4w1hnfsvnh6bvj3vcrq8hw47760sqwa4xa"; settingsSha256 = "09v86y2c8xas9ql0bqr7vrjxx3if6javccwjzyly11dzffm02h7g"; persistencedSha256 = "13s4b73il0lq2hs81q03176n16mng737bfsp3bxnxgnrv3whrayz"; url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix index 3ab1ae28a7b57..b8cdda5a69a5e 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -1,46 +1,52 @@ -{ stdenv, fetchpatch, fetchurl, pam, openssl, perl }: +{ stdenv, fetchpatch, fetchFromGitHub, pam, openssl, perl }: stdenv.mkDerivation rec { - name = "pam_ssh_agent_auth-0.10.3"; + pname = "pam_ssh_agent_auth"; + version = "0.10.4"; - src = fetchurl { - url = "mirror://sourceforge/pamsshagentauth/${name}.tar.bz2"; - sha256 = "0qx78x7nvqdscyp04hfijl4rgyf64xy03prr28hipvgasrcd6lrw"; + src = fetchFromGitHub { + owner = "jbeverly"; + repo = "pam_ssh_agent_auth"; + rev = "pam_ssh_agent_auth-${version}"; + sha256 = "YD1R8Cox0UoNiuWleKGzWSzxJ5lhDRCB2mZPp9OM6Cs="; }; - patches = - [ # Allow multiple colon-separated authorized keys files to be - # specified in the file= option. - ./multiple-key-files.patch - (fetchpatch { - name = "openssl-1.1.1-1.patch"; - url = "https://sources.debian.org/data/main/p/pam-ssh-agent-auth/0.10.3-3/debian/patches/openssl-1.1.1-1.patch"; - sha256 = "1ndp5j4xfhzshhnl345gb4mkldx6vjfa7284xgng6ikhzpc6y7pf"; - }) - (fetchpatch { - name = "openssl-1.1.1-2.patch"; - url = "https://sources.debian.org/data/main/p/pam-ssh-agent-auth/0.10.3-3/debian/patches/openssl-1.1.1-2.patch"; - sha256 = "0ksrs4xr417by8klf7862n3dircvnw30an1akq4pnsd3ichscmww"; - }) - ]; + ed25519-donna = fetchFromGitHub { + owner = "floodyberry"; + repo = "ed25519-donna"; + rev = "8757bd4cd209cb032853ece0ce413f122eef212c"; + sha256 = "ETFpIaWQnlYG8ZuDG2dNjUJddlvibB4ukHquTFn3NZM="; + }; buildInputs = [ pam openssl perl ]; - # It's not clear to me why this is necessary, but without it, you see: - # - # checking OpenSSL header version... 1010104f (OpenSSL 1.1.1d 10 Sep 2019) - # checking OpenSSL library version... 1010104f (OpenSSL 1.1.1d 10 Sep 2019) - # checking whether OpenSSL's headers match the library... no - # configure: WARNING: Your OpenSSL headers do not match your - # library. Check config.log for details. - # - # ...despite the fact that clearly the values match - configureFlags = [ "--without-openssl-header-check" ]; + patches = [ + # Allow multiple colon-separated authorized keys files to be + # specified in the file= option. + ./multiple-key-files.patch + ]; + + configureFlags = [ + # It's not clear to me why this is necessary, but without it, you see: + # + # checking OpenSSL header version... 1010108f (OpenSSL 1.1.1h 22 Sep 2020) + # checking OpenSSL library version... 1010108f (OpenSSL 1.1.1h 22 Sep 2020) + # checking whether OpenSSL's headers match the library... no + # configure: WARNING: Your OpenSSL headers do not match your + # library. Check config.log for details. + # + # ...despite the fact that clearly the values match + "--without-openssl-header-check" + # Make sure it can find ed25519-donna + "--with-cflags=-I$PWD" + ]; + + prePatch = "cp -r ${ed25519-donna}/. ed25519-donna/."; enableParallelBuilding = true; meta = { - homepage = "http://pamsshagentauth.sourceforge.net/"; + homepage = "https://github.com/jbeverly/pam_ssh_agent_auth"; description = "PAM module for authentication through the SSH agent"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch b/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch index 190325251c9a6..71d8e08ecd0bc 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch @@ -87,21 +87,27 @@ diff -u pam_ssh_agent_auth-0.10.3-orig/pam_ssh_agent_auth.c pam_ssh_agent_auth-0 /* * PAM_USER and PAM_RUSER do not necessarily have to get set by the calling application, and we may be unable to divine the latter. -@@ -187,16 +184,17 @@ +@@ -184,5 +181,5 @@ */ if(user && strlen(ruser) > 0) { - pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file); + pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file_input); +@@ -201,3 +197,3 @@ + retval = PAM_SUCCESS; +- pamsshagentauth_logit("Authenticated (sshd): `%s' as `%s' using %s", ruser, user, authorized_keys_file); ++ pamsshagentauth_logit("Authenticated (sshd): `%s' as `%s' using %s", ruser, user, authorized_keys_file_input); + +@@ -211,11 +208,12 @@ /* * this pw_uid is used to validate the SSH_AUTH_SOCK, and so must be the uid of the ruser invoking the program, not the target-user */ - if(pamsshagentauth_find_authorized_keys(user, ruser, servicename)) { /* getpwnam(ruser)->pw_uid)) { */ -- pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, authorized_keys_file); +- pamsshagentauth_logit("Authenticated (agent): `%s' as `%s' using %s", ruser, user, authorized_keys_file); + const char *key_file; + if((key_file = pamsshagentauth_find_authorized_keys(user, ruser, servicename))) { /* getpwnam(ruser)->pw_uid)) { */ -+ pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, key_file); ++ pamsshagentauth_logit("Authenticated (agent): `%s' as `%s' using %s", ruser, user, key_file); retval = PAM_SUCCESS; } else { - pamsshagentauth_logit("Failed Authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file); diff --git a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix index ff9c8f4ce8b48..ee5ead73bc138 100644 --- a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix +++ b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix @@ -1,15 +1,15 @@ { stdenvNoCC, lib, fetchFromGitHub, makeWrapper -, python3, binutils-unwrapped, findutils, kmod, pciutils, raspberrypi-tools +, python3, binutils-unwrapped, findutils, kmod, pciutils, libraspberrypi }: stdenvNoCC.mkDerivation { pname = "raspberrypi-eeprom"; - version = "unstable-2020-10-05"; + version = "2020-12-11"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; - rev = "718820bcebd21d4a619fa262d9b9cf3acbf110f8"; - sha256 = "1277jsiyv34dqpandva8kxy1s0y5ql344pl9gk84avzp1mqjnv4g"; + rev = "54a9796abbee59067bff9da6b90c1014178f2c21"; + sha256 = "0yp7bn444n6yisp4hiblrm00rrvrf213amzb4sh96mlb5nhxspqk"; }; buildInputs = [ python3 ]; @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation { patchShebangs $out/bin wrapProgram $out/bin/rpi-eeprom-update \ --set FIRMWARE_ROOT $out/share/rpi-eeprom \ - ${lib.optionalString stdenvNoCC.isAarch64 "--set VCMAILBOX ${raspberrypi-tools}/bin/vcmailbox"} \ + ${lib.optionalString stdenvNoCC.isAarch64 "--set VCMAILBOX ${libraspberrypi}/bin/vcmailbox"} \ --prefix PATH : "${lib.makeBinPath ([ binutils-unwrapped findutils @@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation { pciutils (placeholder "out") ] ++ lib.optionals stdenvNoCC.isAarch64 [ - raspberrypi-tools + libraspberrypi ])}" ''; diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 7399ac90586c9..59cc59d7714d4 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt, libxml2 -, docbook_xml_dtd_45, docbook_xsl, itstool, flex, bison +{ stdenv, nixosTests, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt +, libxml2 , docbook_xml_dtd_45, docbook_xsl, itstool, flex, bison , pam ? null, glibcCross ? null }: @@ -86,5 +86,6 @@ stdenv.mkDerivation rec { passthru = { shellPath = "/bin/nologin"; + tests = { inherit (nixosTests) shadow; }; }; } diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index f1a0f06eb5870..e6cb589c9bfee 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -111,7 +111,7 @@ assert withCryptsetup -> let wantCurl = withRemote || withImportd; - version = "247"; + version = "247.2"; in stdenv.mkDerivation { inherit version pname; @@ -120,9 +120,9 @@ stdenv.mkDerivation { # This has proven to be less error-prone than the previous systemd fork. src = fetchFromGitHub { owner = "systemd"; - repo = "systemd"; + repo = "systemd-stable"; rev = "v${version}"; - sha256 = "1nwsr6p65zy5jpabvjbszq5g556l1npaf2xsik4p4pvjjwnn1nx6"; + sha256 = "091pwrvxz3gcf80shlp28d6l4gvjzc6pb61v4mwxmk9d71qaq7ry"; }; # If these need to be regenerated, `git am path/to/00*.patch` them into a diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 9a21aab9f256f..0c5a02061b82d 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tomb"; - version = "2.8"; + version = "2.8.1"; src = fetchFromGitHub { owner = "dyne"; repo = "Tomb"; rev = "v${version}"; - sha256 = "sha256-bmkUwj0FFq51MUPbNK7xsyyq4swjZcwFeMwOO3fXCzA="; + sha256 = "03zj9az5626kjg96rkqr5sjydqwlrzhz0gq35r62sajv6mn2qm6s"; }; buildInputs = [ sudo zsh pinentry ]; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index ac6ad8a4bb768..4f8f7cae7f8a8 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "util-linux"; - version = "2.36"; + version = "2.36.1"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1cg0m4psswg71v6wrqc2bngcw20fsp01vbijxdzvdf8kxdkiqjwy"; + sha256 = "1vbyydl1b13lx73di4bhc4br9ih24hcqv7bky0kyrn1c2x1c5yh9"; }; patches = [ diff --git a/pkgs/os-specific/linux/zsa-udev-rules/default.nix b/pkgs/os-specific/linux/zsa-udev-rules/default.nix new file mode 100644 index 0000000000000..76150affe49fc --- /dev/null +++ b/pkgs/os-specific/linux/zsa-udev-rules/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "zsa-udev-rules"; + version = "unstable-2020-12-16"; + + # TODO: use version and source from nixpkgs/pkgs/development/tools/wally-cli/default.nix after next release + src = fetchFromGitHub { + owner = "zsa"; + repo = "wally"; + rev = "e5dde3c700beab39fb941c6941e55535bf9b2af6"; + sha256 = "0pkybi32r1hrmpa1mc8qlzhv7xy5n5rr5ah25lbr0cipp1bda417"; + }; + + # it only installs files + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + installPhase = '' + mkdir -p $out/lib/udev/rules.d + cp dist/linux64/50-oryx.rules $out/lib/udev/rules.d/ + cp dist/linux64/50-wally.rules $out/lib/udev/rules.d/ + ''; + + meta = with stdenv.lib; { + description = "udev rules for ZSA devices"; + license = licenses.mit; + maintainers = with maintainers; [ davidak ]; + platforms = platforms.linux; + homepage = "https://github.com/zsa/wally/wiki/Linux-install#2-create-a-udev-rule-file"; + }; +} diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 6daf3251102b5..9ab14140c67f7 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -3,51 +3,6 @@ let versionMap = { - "0.9" = { - kafkaVersion = "0.9.0.1"; - scalaVersion = "2.11"; - sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v"; - }; - "0.10" = { - kafkaVersion = "0.10.2.2"; - scalaVersion = "2.12"; - sha256 = "13wibnz7n7znv2g13jlpkz1r0y73qy5b02pdqhsq7cl72h9s6wms"; - }; - "0.11" = { - kafkaVersion = "0.11.0.3"; - scalaVersion = "2.12"; - sha256 = "0zkzp9a8lcfcpavks131119v10hpn90sc0pw4f90jc4zn2yw3rgd"; - }; - "1.0" = { - kafkaVersion = "1.0.2"; - scalaVersion = "2.12"; - sha256 = "0cmq8ww1lbkp3ipy9d1q8c1yz4kfwj0v4ynnhsk1i48sqlmvwybj"; - }; - "1.1" = { - kafkaVersion = "1.1.1"; - scalaVersion = "2.12"; - sha256 = "13vg0wm2fsd06pfw05m4bhcgbjmb2bmd4i31zfs48w0f7hjc8qf2"; - }; - "2.0" = { - kafkaVersion = "2.0.1"; - scalaVersion = "2.12"; - sha256 = "0i62q3542cznf711kiskaa30l06gq9ckszlxja4k1vs1flxz5khl"; - }; - "2.1" = { - kafkaVersion = "2.1.1"; - scalaVersion = "2.12"; - sha256 = "1gm7xiqkbg415mbj9mlazcndmky81xvg4wmz0h94yv1whp7fslr0"; - }; - "2.2" = { - kafkaVersion = "2.2.1"; - scalaVersion = "2.12"; - sha256 = "1svdnhdzq9a6jsig513i0ahaysfgar5i385bq9fz7laga6a4z3qv"; - }; - "2.3" = { - kafkaVersion = "2.3.1"; - scalaVersion = "2.12"; - sha256 = "0bldfrvd351agm237icnvn36va67crpnzmbh6dlq84ip910xsgas"; - }; "2.4" = { kafkaVersion = "2.4.1"; scalaVersion = "2.12"; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index bde82468b720c..9e2c482e0d96a 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "20.02.6.1"; + version = "20.11.2.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "0vllyljsmv3y9hw4vfgnz9cnjqhlk55dy1bipssw872aldlxfcdk"; + sha256 = "02vz386ix28yr2lrn9z0hycqmw1d0npvwvx51fhp2mav66rrx79p"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix index 675792da6803b..9a78d5c7c18e4 100644 --- a/pkgs/servers/demoit/default.nix +++ b/pkgs/servers/demoit/default.nix @@ -6,7 +6,6 @@ buildGoModule { pname = "demoit"; version = "unstable-2020-06-11"; - goPackagePath = "github.com/dgageot/demoit"; src = fetchFromGitHub { owner = "dgageot"; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 61ab6f98d21c3..858a4fcb5fa07 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.16.8"; + version = "9.16.10"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "0ccdbqmpvnxlbrxjsx2w8ir4xh961svzcw7n87n8dglj6rb9r6wy"; + sha256 = "sha256-vEf8AZxiBeamv7g5xUShRyMh3wU3upBbhGpMv/4zYrM="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; @@ -22,11 +22,6 @@ stdenv.mkDerivation rec { patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch - # Fix cross-compilation (will be included in next release after 9.16.8) - (fetchpatch { - url = "https://gitlab.isc.org/isc-projects/bind9/-/commit/35ca6df07277adff4df7472a0b01ea5438cdf1ff.patch"; - sha256 = "1sj0hcd0wgkam7hrbp2vw2yymmni4azr9ixd9shz1l6ja90bdj9h"; - }) ]; nativeBuildInputs = [ perl pkg-config ]; diff --git a/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch b/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch index ed315c854c824..0d6ae781b7575 100644 --- a/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch +++ b/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch @@ -1,20 +1,20 @@ -From 931958d8f11cb55f2e88a178a3b828f3c537eba8 Mon Sep 17 00:00:00 2001 +From 7ed6c641cc501246931721700b73f40dce7e8f4b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> -Date: Fri, 6 Mar 2020 23:43:58 +0100 +Date: Tue, 22 Dec 2020 15:38:56 +0100 Subject: [PATCH 1/2] Define configs with env vars --- app.php | 4 ++-- services/DatabaseService.php | 2 +- services/FilesService.php | 2 +- - services/StockService.php | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) + services/StockService.php | 3 +-- + 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app.php b/app.php -index af65ad1..4963c28 100644 +index 8176ebe..04432ba 100644 --- a/app.php +++ b/app.php -@@ -25,7 +25,7 @@ else +@@ -10,7 +10,7 @@ use Slim\Factory\AppFactory; require_once __DIR__ . '/vendor/autoload.php'; // Load config files @@ -23,33 +23,32 @@ index af65ad1..4963c28 100644 require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones // Definitions for dev/demo/prerelease mode -@@ -50,7 +50,7 @@ $app = AppFactory::create(); +@@ -37,7 +37,7 @@ $app = AppFactory::create(); + $container = $app->getContainer(); - $container->set('view', function(Container $container) - { + $container->set('view', function (Container $container) { - return new Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache'); -+ return new \Slim\Views\Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR')); ++ return new Slim\Views\Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR')); }); - $container->set('LoginControllerInstance', function(Container $container) - { + $container->set('UrlManager', function (Container $container) { + return new UrlManager(GROCY_BASE_URL); diff --git a/services/DatabaseService.php b/services/DatabaseService.php -index 23fc7b9..daa1993 100644 +index d1080b0..8bc4ee1 100644 --- a/services/DatabaseService.php +++ b/services/DatabaseService.php -@@ -25,7 +25,7 @@ class DatabaseService - return GROCY_DATAPATH . '/grocy_' . GROCY_CULTURE . '.db'; +@@ -105,6 +105,6 @@ class DatabaseService + return GROCY_DATAPATH . '/grocy_' . $dbSuffix . '.db'; } - return GROCY_DATAPATH . '/grocy.db'; + return getenv('GROCY_DB_FILE'); } - - private static $DbConnectionRaw = null; + } diff --git a/services/FilesService.php b/services/FilesService.php -index cecdae3..357298d 100644 +index 8c1483e..8f74b4b 100644 --- a/services/FilesService.php +++ b/services/FilesService.php -@@ -12,7 +12,7 @@ class FilesService extends BaseService +@@ -70,7 +70,7 @@ class FilesService extends BaseService { parent::__construct(); @@ -59,18 +58,19 @@ index cecdae3..357298d 100644 if (!file_exists($this->StoragePath)) { diff --git a/services/StockService.php b/services/StockService.php -index bfde3fc..53b2245 100644 +index 4741b4b..6d4e748 100644 --- a/services/StockService.php +++ b/services/StockService.php -@@ -934,7 +934,7 @@ class StockService extends BaseService +@@ -1374,8 +1374,7 @@ class StockService extends BaseService throw new \Exception('No barcode lookup plugin defined'); } - $path = GROCY_DATAPATH . "/plugins/$pluginName.php"; -+ $path = getenv('GROCY_PLUGIN_DIR'); +- ++ $path = getenv('GROCY_PLUGIN_DIR') . "/$pluginName.php"; if (file_exists($path)) { require_once $path; -- -2.25.0 +2.29.2 diff --git a/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch b/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch index e7f84a146fbf2..b065ca801d5fd 100644 --- a/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch +++ b/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch @@ -1,24 +1,24 @@ -From 1556489f0b475ae56e5ed3afba19cc2abb696a76 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Thu, 16 Apr 2020 19:37:32 +0200 -Subject: [PATCH 2/2] Remove check for config-file as it's stored in /etc/grocy - ---- - helpers/PrerequisiteChecker.php | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/helpers/PrerequisiteChecker.php b/helpers/PrerequisiteChecker.php -index d4bf74c6..ca7686c9 100644 ---- a/helpers/PrerequisiteChecker.php -+++ b/helpers/PrerequisiteChecker.php -@@ -8,7 +8,6 @@ class PrerequisiteChecker +From c46323dfc4a3d5bf17f7508f5b5f223858a598c3 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Tue, 22 Dec 2020 15:39:15 +0100 +Subject: [PATCH 2/2] Remove check for config-file as it's stored in /etc/grocy + +--- + helpers/PrerequisiteChecker.php | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/helpers/PrerequisiteChecker.php b/helpers/PrerequisiteChecker.php +index cbe0a3a..a484db2 100644 +--- a/helpers/PrerequisiteChecker.php ++++ b/helpers/PrerequisiteChecker.php +@@ -11,7 +11,6 @@ class PrerequisiteChecker { - public function checkRequirements() - { -- self::checkForConfigFile(); - self::checkForConfigDistFile(); - self::checkForComposer(); - self::checkForYarn(); --- -2.25.0 - + public function checkRequirements() + { +- self::checkForConfigFile(); + self::checkForConfigDistFile(); + self::checkForComposer(); + self::checkForPhpExtensions(); +-- +2.29.2 + diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix index 193f3929809a4..2f2772505f6af 100644 --- a/pkgs/servers/grocy/default.nix +++ b/pkgs/servers/grocy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "grocy"; - version = "2.7.1"; + version = "3.0.0"; src = fetchurl { url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; - sha256 = "0ab1yxj499vadakq2c1lils3ir6fm02wrdgrirrlar4s4z6c4p7r"; + sha256 = "sha256-O7DksfA95IHvLJyRrWG8iECcUUDsOtytd78koNZdQzE="; }; nativeBuildInputs = [ unzip ]; @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { unzip ${src} -d . ''; + # NOTE: if patches are created from a git checkout, those should be modified + # with `unixdos` to make sure those apply here. patches = [ ./0001-Define-configs-with-env-vars.patch ./0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 456b30cb39721..9135ea549f34e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.118.5"; + version = "2020.12.1"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -56,7 +56,7 @@ "aten_pe" = ps: with ps; [ ]; # missing inputs: atenpdu "atome" = ps: with ps; [ ]; # missing inputs: pyatome "august" = ps: with ps; [ ]; # missing inputs: py-august - "aurora" = ps: with ps; [ ]; + "aurora" = ps: with ps; [ ]; # missing inputs: auroranoaa "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy "auth" = ps: with ps; [ aiohttp-cors ]; "automation" = ps: with ps; [ aiohttp-cors ]; @@ -113,7 +113,7 @@ "channels" = ps: with ps; [ ]; # missing inputs: pychannels "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook "cisco_ios" = ps: with ps; [ pexpect ]; - "cisco_mobility_express" = ps: with ps; [ ]; # missing inputs: ciscomobilityexpress + "cisco_mobility_express" = ps: with ps; [ ciscomobilityexpress ]; "cisco_webex_teams" = ps: with ps; [ ]; # missing inputs: webexteamssdk "citybikes" = ps: with ps; [ ]; "clementine" = ps: with ps; [ ]; # missing inputs: python-clementine-remote @@ -253,6 +253,7 @@ "filesize" = ps: with ps; [ ]; "filter" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "fints" = ps: with ps; [ fints ]; + "fireservicerota" = ps: with ps; [ ]; # missing inputs: pyfireservicerota "firmata" = ps: with ps; [ ]; # missing inputs: pymata-express "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; "fixer" = ps: with ps; [ ]; # missing inputs: fixerio @@ -421,6 +422,7 @@ "knx" = ps: with ps; [ ]; # missing inputs: xknx "kodi" = ps: with ps; [ ]; # missing inputs: pykodi "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected + "kulersky" = ps: with ps; [ ]; # missing inputs: pykulersky "kwb" = ps: with ps; [ ]; # missing inputs: pykwb "lacrosse" = ps: with ps; [ ]; # missing inputs: pylacrosse "lametric" = ps: with ps; [ ]; # missing inputs: lmnotify @@ -506,6 +508,7 @@ "mold_indicator" = ps: with ps; [ ]; "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; + "motion_blinds" = ps: with ps; [ ]; # missing inputs: motionblinds "mpchc" = ps: with ps; [ ]; "mpd" = ps: with ps; [ mpd2 ]; "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; @@ -558,6 +561,7 @@ "nuimo_controller" = ps: with ps; [ ]; # missing inputs: --only-binary=all nuimo "nuki" = ps: with ps; [ ]; # missing inputs: pynuki "numato" = ps: with ps; [ ]; # missing inputs: numato-gpio + "number" = ps: with ps; [ ]; "nut" = ps: with ps; [ ]; # missing inputs: pynut2 "nws" = ps: with ps; [ ]; # missing inputs: pynws "nx584" = ps: with ps; [ ]; # missing inputs: pynx584 @@ -596,7 +600,7 @@ "otp" = ps: with ps; [ pyotp ]; "ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ]; - "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: python-openzwave-mqtt + "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: python-openzwave-mqtt[mqtt-client] "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect ]; @@ -618,7 +622,7 @@ "plaato" = ps: with ps; [ aiohttp-cors ]; "plant" = ps: with ps; [ sqlalchemy ]; "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ]; - "plugwise" = ps: with ps; [ ]; # missing inputs: Plugwise_Smile + "plugwise" = ps: with ps; [ ]; # missing inputs: plugwise "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad "pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint @@ -697,7 +701,6 @@ "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: pysabnzbd "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa pillow ]; # missing inputs: home-assistant-frontend "saj" = ps: with ps; [ ]; # missing inputs: pysaj - "salt" = ps: with ps; [ ]; # missing inputs: saltbox "samsungtv" = ps: with ps; [ samsungctl samsungtvws ]; "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra "scene" = ps: with ps; [ ]; @@ -774,6 +777,7 @@ "spotify" = ps: with ps; [ aiohttp-cors spotipy ]; "sql" = ps: with ps; [ sqlalchemy ]; "squeezebox" = ps: with ps; [ pysqueezebox ]; + "srp_energy" = ps: with ps; [ ]; # missing inputs: srpenergy "ssdp" = ps: with ps; [ aiohttp-cors defusedxml netdisco zeroconf ]; "starline" = ps: with ps; [ ]; # missing inputs: starline "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank @@ -801,7 +805,7 @@ "syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru url-normalize "synology" = ps: with ps; [ ]; # missing inputs: py-synology "synology_chat" = ps: with ps; [ ]; - "synology_dsm" = ps: with ps; [ ]; # missing inputs: python-synology + "synology_dsm" = ps: with ps; [ ]; # missing inputs: synologydsm-api "synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm "syslog" = ps: with ps; [ ]; "system_health" = ps: with ps; [ aiohttp-cors ]; @@ -864,9 +868,9 @@ "twilio" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; + "twinkly" = ps: with ps; [ ]; # missing inputs: twinkly-client "twitch" = ps: with ps; [ ]; # missing inputs: python-twitch-client "twitter" = ps: with ps; [ ]; # missing inputs: TwitterAPI - "ubee" = ps: with ps; [ ]; # missing inputs: pyubee "ubus" = ps: with ps; [ ]; "ue_smart_radio" = ps: with ps; [ ]; "uk_transport" = ps: with ps; [ ]; @@ -954,7 +958,6 @@ "yandextts" = ps: with ps; [ ]; "yeelight" = ps: with ps; [ yeelight ]; "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower - "yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; "zabbix" = ps: with ps; [ ]; # missing inputs: py-zabbix "zamg" = ps: with ps; [ ]; @@ -962,7 +965,7 @@ "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; "zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc "zestimate" = ps: with ps; [ xmltodict ]; - "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ]; + "zha" = ps: with ps; [ bellows pyserial-asyncio pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ]; "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl "zodiac" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 147ea06434b73..12dc7b6816184 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -62,7 +62,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.118.5"; + hassVersion = "2020.12.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -78,7 +78,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1711qhcvrzl599cryd9wzamacn1vv37w67vprqgibnbw58kcpilj"; + sha256 = "1hd3z0bvscrg0ihy26djm1x9cj1pkdbnsgpzhdy42j8vy80q9bxr"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 825576e92ad12..36f89dc0069ea 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20201111.2"; + version = "20201212.0"; src = fetchPypi { inherit pname version; - sha256 = "1pk4l78j72zn6gxc0yr3azdlcqwkvf7ki0khm176qpvs34scs1l8"; + sha256 = "1nz5f7bpj0xs740af8i6j33idff6yzx7z9vydlah2sxcdgpwmz84"; }; # no Python tests implemented diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 4b63b589ea952..71f8c8054c714 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit apr aprutil sslSupport proxySupport ldapSupport; + inherit apr aprutil sslSupport proxySupport ldapSupport luaSupport lua5; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 6ec5b0a785109..2b2af8966e990 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -149,6 +149,6 @@ stdenv.mkDerivation { homepage = "http://nginx.org"; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice raskin fpletz globin ]; + maintainers = with maintainers; [ thoughtpolice raskin fpletz globin ajs124 ]; }; } diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index edb87258d6b71..cadc1064ac046 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.19.5"; - sha256 = "173rv8gacd9bakb0r9jmkr4pqgjw9mzpdh3f7x2d8ln4ssplc2jw"; + version = "1.19.6"; + sha256 = "1d9kzks8x1226prjbpdin4dz93fjnv304zlqybfqachx5fh9a4di"; } diff --git a/pkgs/servers/icecream/default.nix b/pkgs/servers/icecream/default.nix new file mode 100644 index 0000000000000..1800700b04086 --- /dev/null +++ b/pkgs/servers/icecream/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, docbook2x, libarchive, libcap_ng, lzo, zstd, docbook_xml_dtd_45 }: + +stdenv.mkDerivation rec { + pname = "icecream"; + version = "2020-04-15"; + + src = fetchFromGitHub { + owner = "icecc"; + repo = pname; + rev = "c370c4d701d05e1872d44d1c1642a774a7f25807"; + sha256 = "0ld2ihd39irlk4wshpbw7inmgyl3x0gbkgsy10izcm1wwfc0x2ac"; + }; + enableParallelBuilding = true; + + nativeBuildInputs = [ autoreconfHook docbook2x ]; + buildInputs = [ libarchive libcap_ng lzo zstd docbook_xml_dtd_45 ]; + + meta = with stdenv.lib; { + description = "Distributed compiler with a central scheduler to share build load"; + inherit (src.meta) homepage; + license = licenses.gpl2; + maintainers = with maintainers; [ emantor ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix index 10b2306130775..d0fded5c63b5b 100644 --- a/pkgs/servers/mail/mailhog/default.nix +++ b/pkgs/servers/mail/mailhog/default.nix @@ -2,24 +2,22 @@ buildGoPackage rec { pname = "MailHog"; - version = "1.0.0"; - rev = "v${version}"; + version = "1.0.1"; goPackagePath = "github.com/mailhog/MailHog"; src = fetchFromGitHub { - inherit rev; owner = "mailhog"; repo = "MailHog"; - sha256 = "0r6zidkffb8q12zyxd063jy0ig2x93llna4zb5i2qjh9gb971i83"; + rev = "v${version}"; + sha256 = "124216850572r1h0ii7ad6jd1cd5czcvkz7k2jzvjb4pv2kl8p3y"; }; - goDeps = ./deps.nix; - meta = with stdenv.lib; { description = "Web and API based SMTP testing"; homepage = "https://github.com/mailhog/MailHog"; - maintainers = with maintainers; [ disassembler ]; + changelog = "https://github.com/mailhog/MailHog/releases/tag/v${version}"; + maintainers = with maintainers; [ disassembler jojosch ]; license = licenses.mit; }; } diff --git a/pkgs/servers/mail/mailhog/deps.nix b/pkgs/servers/mail/mailhog/deps.nix deleted file mode 100644 index 9967c3a549a55..0000000000000 --- a/pkgs/servers/mail/mailhog/deps.nix +++ /dev/null @@ -1,191 +0,0 @@ -[ - { - goPackagePath = "github.com/gorilla/pat"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/pat"; - rev = "cf955c3d1f2c27ee96f93e9738085c762ff5f49d"; - sha256 = "1jnhdhba3cwgsgv6qf7shvmk2nbbp8z30n9cimz9w6vd940ipisf"; - }; - } - { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "1ea25387ff6f684839d82767c1733ff4d4d15d0a"; - sha256 = "1nh1nzxcsgd215x4xn59wc4cbqfa8zvhvnnx5p8fkrn4bj1cgak4"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "bcd8bc72b08df0f70df986b97f95590779502d31"; - sha256 = "0majd18zn8v1b1agn015vnk3xk2v8j5nyckczlf72gm3kaq3icga"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "3ab3a8b8831546bd18fd182c20687ca853b2bb13"; - sha256 = "17y94ngp1yrswq5pxxy97naiw6jgxz2yvm8zydi83gfixdgs99fc"; - }; - } - { - goPackagePath = "github.com/ian-kent/go-log"; - fetch = { - type = "git"; - url = "https://github.com/ian-kent/go-log"; - rev = "5731446c36ab9f716106ce0731f484c50fdf1ad1"; - sha256 = "1qr0myg68r9zq43fnx0rbnxcny2jpyg3gc269pc2riskqk0a731d"; - }; - } - { - goPackagePath = "github.com/ian-kent/envconf"; - fetch = { - type = "git"; - url = "https://github.com/ian-kent/envconf"; - rev = "c19809918c02ab33dc8635d68c77649313185275"; - sha256 = "1085863rnx4h0q9xvg4zlsc7xf7jngfmjrq83cpcv1ayi664mzdx"; - }; - } - { - goPackagePath = "github.com/ian-kent/goose"; - fetch = { - type = "git"; - url = "https://github.com/ian-kent/goose"; - rev = "c3541ea826ad9e0f8a4a8c15ca831e8b0adde58c"; - sha256 = "0v98d2554vlrm8mzk2zx8wj3daq076273w0zs8ww1aa57a1l74qv"; - }; - } - { - goPackagePath = "github.com/ian-kent/linkio"; - fetch = { - type = "git"; - url = "https://github.com/ian-kent/linkio"; - rev = "77fb4b01842cb4b019137c0227df9a8f9779d0bd"; - sha256 = "0fixidplxzmw7aakw19d64nvrykwm5xk55fj1q74n70s8j5d8hiq"; - }; - } - { - goPackagePath = "github.com/mailhog/MailHog-Server"; - fetch = { - type = "git"; - url = "https://github.com/mailhog/MailHog-Server"; - rev = "50f74a1aa2991b96313144d1ac718ce4d6739dfd"; - sha256 = "1h0qs66bvgygpq0sz3w6y445vm3pvlrljr5x7xr13y0087mrpjla"; - }; - } - { - goPackagePath = "github.com/mailhog/MailHog-UI"; - fetch = { - type = "git"; - url = "https://github.com/mailhog/MailHog-UI"; - rev = "24b31a47cc5b65d23576bb9884c941d2b88381f7"; - sha256 = "0309jmryhx3n0yksssk2j4xkh1xb01468i5f2sy3a83xkz9p3d54"; - }; - } - { - goPackagePath = "github.com/mailhog/http"; - fetch = { - type = "git"; - url = "https://github.com/mailhog/http"; - rev = "2e653938bf190d0e2fbe4825ce74e5bc149a62f2"; - sha256 = "18j03lvyis7z0mv3fym3j9a7pi2qvnhggmhpxnjbwvwb86dhxjm8"; - }; - } - { - goPackagePath = "github.com/mailhog/mhsendmail"; - fetch = { - type = "git"; - url = "https://github.com/mailhog/mhsendmail"; - rev = "002527025ef50364446d7560600aedc5daaa1997"; - sha256 = "11l2y0xb7hwk0zs7pwif3xkclhz32sc0jff3jkaxi3jdf3q3kz91"; - }; - } - { - goPackagePath = "github.com/mailhog/data"; - fetch = { - type = "git"; - url = "https://github.com/mailhog/data"; - rev = "024d554958b5bea5db220bfd84922a584d878ded"; - sha256 = "0dgh0pcsn0xrxsn1qlxgdssaimch57kxj5vyvhqjnsdnh814g9vf"; - }; - } - { - goPackagePath = "github.com/mailhog/smtp"; - fetch = { - type = "git"; - url = "https://github.com/mailhog/smtp"; - rev = "0c4e9b7e0625fec61d0c30d7b2f6c62852be6c54"; - sha256 = "1w46w3asdxsgzyall16hi2s4jvkka1k3a1l52ryfhrzg187krir6"; - }; - } - { - goPackagePath = "github.com/mailhog/storage"; - fetch = { - type = "git"; - url = "https://github.com/mailhog/storage"; - rev = "6d871fb23ecd873cb10cdfc3a8dec5f50d2af8fa"; - sha256 = "1ya0xigm2xysin59zlp2sbqncnmw9h77r9dn9k7vxhf0z8vvbibk"; - }; - } - { - goPackagePath = "github.com/ogier/pflag"; - fetch = { - type = "git"; - url = "https://github.com/ogier/pflag"; - rev = "32a05c62658bd1d7c7e75cbc8195de5d585fde0f"; - sha256 = "1lyrr9wx0j087mnpsxcbspjcgh9a5c6bqwrasd8s237jlyc50qmj"; - }; - } - { - goPackagePath = "github.com/tinylib/msgp"; - fetch = { - type = "git"; - url = "https://github.com/tinylib/msgp"; - rev = "02d047e07459c5a7b02b1244161d0f2f6d8f660d"; - sha256 = "12y7qz1x266m0a0w3zwd49achxbh036yhkmx93xfs2283xh70q1r"; - }; - } - { - goPackagePath = "github.com/philhofer/fwd"; - fetch = { - type = "git"; - url = "https://github.com/philhofer/fwd"; - rev = "1612a298117663d7bc9a760ae20d383413859798"; - sha256 = "155l0nvvblpx0fy683q6bzins7csh8fw7yf64hbia8hc7wh0gjdl"; - }; - } - { - goPackagePath = "github.com/t-k/fluent-logger-golang"; - fetch = { - type = "git"; - url = "https://github.com/t-k/fluent-logger-golang"; - rev = "0f8ec08f2057a61574b6943e75045fffbeae894e"; - sha256 = "0ic5bj87wpq1kncixd5mklwqn1jjwqfqfvkyl0mrnwp3p5p24v5c"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6"; - sha256 = "1y2bbghi594m8p4pcm9pwrzql06179xj6zvhaghwcc6y0l48rbgp"; - }; - } - { - goPackagePath = "gopkg.in/mgo.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/mgo.v2"; - rev = "d90005c5262a3463800497ea5a89aed5fe22c886"; - sha256 = "1z81k6mnfk07hkrkw31l16qycyiwa6wzyhysmywgkh58sm5dc9m7"; - }; - } -] diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index a63d75552cc08..d6ab3ec34b869 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; rev = "v${version}"; - sha256 = "1c77f3ffm6m9j8q9p1hb9i8zrqqpvfkr9ffamly44gs7xddmv9sv"; + sha256 = "sha256-RkMgzYu6r30uqUCtCS/FuvJQiTInRYWiWhlTtDQQh5g="; }; buildInputs = [ olm ]; - vendorSha256 = "01yr5321paqifmgzz235lknsa0w4hbs3182y6pxw8hqsvh18c48b"; + vendorSha256 = "sha256-p6TW5ACXjqCR5IAVleMEIWYW4SHI1ZRL5KJFZpPc7yU="; doCheck = false; diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index 42b07e605a0b3..a7d2da6ac570f 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -1,32 +1,18 @@ -{ stdenv, lib, fetchurl, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools +{ stdenv, lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools , fetchFromGitHub, makeWrapper }: perlPackages.buildPerlPackage rec { pname = "FusionInventory-Agent"; - version = "2.3.21"; + version = "2.6"; src = fetchFromGitHub { owner = "fusioninventory"; repo = "fusioninventory-agent"; rev = version; - sha256 = "034clffcn0agx85macjgml4lyhvvck7idn94pqd2c77pk6crvw2y"; + sha256 = "1hbp5a9m03n6a80xc8z640zs71qhqk4ifafr6fp0vvzzvq097ip2"; }; - patches = [ - ./remove_software_test.patch - # support for os-release file - (fetchurl { - url = "https://github.com/fusioninventory/fusioninventory-agent/pull/396.diff"; - sha256 = "0bxrjmff80ab01n23xggci32ajsah6zvcmz5x4hj6ayy6dzwi6jb"; - }) - # support for Nix software inventory - (fetchurl { - url = "https://github.com/fusioninventory/fusioninventory-agent/pull/397.diff"; - sha256 = "0pyf7mp0zsb3zcqb6yysr1zfp54p9ciwjn1pzayw6s9flmcgrmbw"; - }) - ]; - postPatch = '' patchShebangs bin @@ -68,6 +54,9 @@ perlPackages.buildPerlPackage rec { XMLTreePP ]; + # Test fails due to "Argument list too long" + doCheck = false; + installPhase = '' mkdir -p $out diff --git a/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch b/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch deleted file mode 100644 index b360f418aa0bb..0000000000000 --- a/pkgs/servers/monitoring/fusion-inventory/remove_software_test.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/t/agent/snmp/live.t b/t/agent/snmp/live.t -index 8ee7ff02c..bd5551ab3 100755 ---- a/t/agent/snmp/live.t -+++ b/t/agent/snmp/live.t -@@ -11,7 +11,7 @@ use Test::More; - use FusionInventory::Agent::XML::Response; - use FusionInventory::Agent::SNMP::Live; - --plan tests => 12; -+plan tests => 11; - - my $snmp; - throws_ok { -@@ -52,15 +52,6 @@ throws_ok { - } qr/^Unable to resolve the UDP\/IPv4 address "none"/, - 'instanciation: unresolvable host'; - --throws_ok { -- $snmp = FusionInventory::Agent::SNMP::Live->new( -- version => 1, -- community => 'public', -- hostname => '1.1.1.1' -- ); --} qr/no response from host 1.1.1.1/, --'instanciation: unresponding host'; -- - SKIP: { - skip 'live SNMP test disabled', 6 unless $ENV{TEST_LIVE_SNMP}; - -diff --git a/t/apps/agent.t b/t/apps/agent.t -index c0f6fc52f..c83837d70 100755 ---- a/t/apps/agent.t -+++ b/t/apps/agent.t -@@ -12,7 +12,7 @@ use XML::TreePP; - use FusionInventory::Agent::Tools; - use FusionInventory::Test::Utils; - --plan tests => 34; -+plan tests => 33; - - my ($content, $out, $err, $rc); - -@@ -71,11 +71,6 @@ subtest "first inventory execution and content" => sub { - check_content_ok($out); - }; - --ok( -- exists $content->{REQUEST}->{CONTENT}->{SOFTWARES}, -- 'inventory has software' --); -- - ok( - exists $content->{REQUEST}->{CONTENT}->{ENVS}, - 'inventory has environment variables' -diff --git a/t/tasks/inventory/linux/softwares.t b/t/tasks/inventory/linux/softwares.t -index 72a0e578c..13944f34f 100755 ---- a/t/tasks/inventory/linux/softwares.t -+++ b/t/tasks/inventory/linux/softwares.t -@@ -89,7 +89,7 @@ my $rpm_packages = [ - PUBLISHER => 'Mageia.Org', - NAME => 'xfsprogs', - COMMENTS => 'Utilities for managing the XFS filesystem', -- INSTALLDATE => '25/03/2012', -+ INSTALLDATE => '24/03/2012', - FILESIZE => '3628382', - FROM => 'rpm', - ARCH => 'x86_64', diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index f1cefdc0b1d9c..a3e85e2b822e1 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -1,37 +1,21 @@ -{ stdenv -, lib -, buildGoModule -, fetchFromGitHub -, makeWrapper -, nixosTests -, systemd -, fetchpatch +{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, nixosTests, systemd }: buildGoModule rec { - version = "2.0.0"; + version = "2.1.0"; pname = "grafana-loki"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "09a0mqdmk754vigd1xqijzwazwrmfaqcgdr2c6dz25p7a65568hj"; + sha256 = "O/3079a67j1i9pgf18SBx0iJcQPVmb0H+K/PzQVBCDQ="; }; vendorSha256 = null; subPackages = [ "..." ]; - patches = [ - (fetchpatch { - # Fix expected return value in Test_validateDropConfig - # https://github.com/grafana/loki/issues/2519 - url = "https://github.com/grafana/loki/commit/1316c0f0c5cda7c272c4873ea910211476fc1db8.patch"; - sha256 = "06hwga58qpmivbhyjgyqzb75602hy8212a4b5vh99y9pnn6c913h"; - }) - ]; - nativeBuildInputs = [ makeWrapper ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ]; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 6ab1c80ecedf5..2852fb2afc29c 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,13 +1,15 @@ -{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests }: +{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests +, fetchpatch +}: let - version = "2.22.2"; + version = "2.23.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "04pf3shdfd25wf8snkan5hzv1gjzazjw06i11xaamnc8gfahnzdv"; + sha256 = "sha256-UQ1r8271EiZDU/h2zta6toMRfk2GjXol8GexYL9n+BE="; }; webui = mkYarnPackage { @@ -29,15 +31,23 @@ in buildGoPackage rec { goPackagePath = "github.com/prometheus/prometheus"; + patches = [ + # Fix https://github.com/prometheus/prometheus/issues/8144 + (fetchpatch { + url = "https://github.com/prometheus/prometheus/commit/8b64b70fe4a5aa2877c95aa12c6798b12d3ff7ec.patch"; + sha256 = "sha256-RuXT5pBXv8z6WoE59KNGh+OXr1KGLGWs/n0Hjf4BuH8="; + }) + ]; + postPatch = '' ln -s ${webui.node_modules} web/ui/react-app/node_modules ln -s ${webui} web/ui/static/react ''; + buildFlags = "-tags=builtinassets"; buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in [ - "-tags=builtinassets" '' -ldflags= -X ${t}.Version=${version} diff --git a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix index 9499f70e71bd8..cdece1212433f 100644 --- a/pkgs/servers/monitoring/prometheus/lnd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/lnd-exporter.nix @@ -1,17 +1,17 @@ { stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { - pname = "lndmon-unstable"; - version = "2020-01-09"; + pname = "lndmon"; + version = "unstable-2020-12-04"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "lndmon"; - sha256 = "0d4z8yv2459wsi4c91qs5an13acn73fd8s321xya5vxxiyf51q24"; - rev = "2c7c5ce0fcb4e7eef4df60efe8a644587a309f6c"; + sha256 = "0q72jbkhw1vpwxd0r80l1v4ab71sakc315plfqbijy7al9ywq5nl"; + rev = "f07d574320dd1a6a428fecd47f3a5bb46a0fc4d1"; }; - vendorSha256 = "083h2ksnqmcr48958r5pag9a28xvljpc3prip6wn70ifp2wpjpin"; + vendorSha256 = "06if387b9m02ciqgcissih1x06l33djp87vgspwzz589f77vczk8"; doCheck = false; diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix index 2c2fabf2357d5..771bbf39b081e 100644 --- a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix @@ -1,21 +1,23 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "nginxlog_exporter"; - version = "1.3.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "martin-helmich"; repo = "prometheus-nginxlog-exporter"; rev = "v${version}"; - sha256 = "0cma6hgagqdms6x40v0q4jn8gjq1awyg1aqk5l8mz7l6k132qq7k"; + sha256 = "1kqyjw5yqgjb8xa5irdhpqvwp1qhba6igpc23n2qljhbh0aybkbq"; }; - goPackagePath = "github.com/martin-helmich/prometheus-nginxlog-exporter"; + vendorSha256 = "130hq19y890amxhjywg5blassl8br2p9d62aai8fj839p3p2a7zp"; - goDeps = ./nginxlog-exporter_deps.nix; + subPackages = [ "." ]; - doCheck = true; + runVend = true; + + passthru.tests = { inherit (nixosTests.prometheus-exporters) nginxlog; }; meta = with stdenv.lib; { description = "Export metrics from Nginx access log files to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/nginxlog-exporter_deps.nix deleted file mode 100644 index 3051258a6361a..0000000000000 --- a/pkgs/servers/monitoring/prometheus/nginxlog-exporter_deps.nix +++ /dev/null @@ -1,282 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/armon/go-radix"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-radix"; - rev = "v1.0.0"; - sha256 = "1m1k0jz9gjfrk4m7hjm7p03qmviamfgxwm2ghakqxw3hdds8v503"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3ac7bf7a47d1"; - sha256 = "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "0c1f6d65b5a1"; - sha256 = "1ad3zv0s3swslfwmk0wry9qbjz596689z13f2s7d9gska6msigsl"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "0766667cb4d1"; - sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; - }; - } - { - goPackagePath = "github.com/hashicorp/consul"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/consul"; - rev = "de080672fee9"; - sha256 = "1q46gn7gv7ara21akkbyzlnari4naxax2d0z917y56ra4lwm259i"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-msgpack"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-msgpack"; - rev = "v0.5.3"; - sha256 = "00jv0ajqd58pkb2yyhlrjp0rv1mvb1ijx3yqjyikcmzvk9jb4h5m"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "v0.5.1"; - sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "v1.0.0"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "v1.0.0"; - sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; - }; - } - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "v4.20.0"; - sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "5636dc67ae77"; - sha256 = "0fb4w52zp0jk8218gwk4wgbhpj7d4hp6n00dvm8s0ajbysbx524d"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec335"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "4402f4e5ea79"; - sha256 = "1nskicw0k0kay9dqg8hw2clgcnvjfcz839rijvrz4wh7gl42qiag"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "abf152e5f3e9"; - sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws"; - }; - } - { - goPackagePath = "github.com/satyrius/gonx"; - fetch = { - type = "git"; - url = "https://github.com/satyrius/gonx"; - rev = "47c52b995fe5"; - sha256 = "0f0b6ac9xlai168d32zas4v2afk5b2q1bs0qi3dykkk6lhq7b58m"; - }; - } - { - goPackagePath = "github.com/smartystreets/assertions"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/assertions"; - rev = "b2de0cb4f26d"; - sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; - }; - } - { - goPackagePath = "github.com/smartystreets/goconvey"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/goconvey"; - rev = "200a235640ff"; - sha256 = "08hgfwjs5zqwsx1z5ja15d0g4glprb3ck7dfi88kwv5q5fl1p139"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.4.0"; - sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "c200b10b5d5e"; - sha256 = "1f764m3q05q2dq1pdms07jcixw4xakqw46w1djrmbhjmd9q8b0av"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v1"; - rev = "dd632973f1e7"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.4"; - sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2"; - }; - } -] diff --git a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix index 56f9ec7227829..8475e7533b0e0 100644 --- a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix +++ b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix @@ -18,11 +18,11 @@ }; } { - name = "_babel_compat_data___compat_data_7.11.0.tgz"; + name = "_babel_compat_data___compat_data_7.12.5.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz"; - sha1 = "e9f73efe09af1355b723a7f39b11bad637d7c99c"; + name = "_babel_compat_data___compat_data_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.5.tgz"; + sha1 = "f56db0c4bb1bbbf221b4e81345aab4141e7cb0e9"; }; } { @@ -34,19 +34,19 @@ }; } { - name = "_babel_core___core_7.11.6.tgz"; + name = "_babel_core___core_7.12.3.tgz"; path = fetchurl { - name = "_babel_core___core_7.11.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz"; - sha1 = "3a9455dc7387ff1bac45770650bc13ba04a15651"; + name = "_babel_core___core_7.12.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz"; + sha1 = "1b436884e1e3bff6fb1328dc02b208759de92ad8"; }; } { - name = "_babel_generator___generator_7.11.6.tgz"; + name = "_babel_generator___generator_7.12.5.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.11.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz"; - sha1 = "b868900f81b163b4d464ea24545c61cbac4dc620"; + name = "_babel_generator___generator_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz"; + sha1 = "a2c50de5c8b6d708ab95be5e6053936c1884a4de"; }; } { @@ -66,11 +66,11 @@ }; } { - name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.11.5.tgz"; + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.12.4.tgz"; path = fetchurl { - name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.11.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.11.5.tgz"; - sha1 = "4ea43dd63857b0a35cd1f1b161dc29b43414e79f"; + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.12.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz"; + sha1 = "55fc1ead5242caa0ca2875dcb8eed6d311e50f48"; }; } { @@ -82,27 +82,27 @@ }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.10.4.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.12.5.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz"; - sha1 = "804ae8e3f04376607cc791b9d47d540276332bd2"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz"; + sha1 = "cb470c76198db6a24e9dbc8987275631e5d29831"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.10.5.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.12.1.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz"; - sha1 = "9f61446ba80e8240b0a5c85c6fdac8459d6f259d"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz"; + sha1 = "3c45998f431edd4a9214c5f1d3ad1448a6137f6e"; }; } { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.10.4.tgz"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.1.tgz"; path = fetchurl { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz"; - sha1 = "fdd60d88524659a0b6959c0579925e425714f3b8"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz"; + sha1 = "18b1302d4677f9dc4740fe8c9ed96680e29d37e8"; }; } { @@ -114,11 +114,11 @@ }; } { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.11.4.tgz"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.12.1.tgz"; path = fetchurl { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.11.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz"; - sha1 = "2d8e3470252cc17aba917ede7803d4a7a276a41b"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz"; + sha1 = "8006a466695c4ad86a2a5f2fb15b5f2c31ad5633"; }; } { @@ -146,27 +146,27 @@ }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.1.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz"; - sha1 = "ae69c83d84ee82f4b42f96e2a09410935a8f26df"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz"; + sha1 = "fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.12.5.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz"; - sha1 = "4c5c54be04bd31670a7382797d75b9fa2e5b5620"; + name = "_babel_helper_module_imports___helper_module_imports_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz"; + sha1 = "1bfc0229f794988f76ed0a4d4e90860850b54dfb"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.12.1.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"; - sha1 = "b16f250229e47211abdd84b34b64737c2ab2d359"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz"; + sha1 = "7954fec71f5b32c48e4b303b437c34453fd7247c"; }; } { @@ -194,35 +194,35 @@ }; } { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.11.4.tgz"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.12.1.tgz"; path = fetchurl { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.11.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz"; - sha1 = "4474ea9f7438f18575e30b0cac784045b402a12d"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz"; + sha1 = "8c4dbbf916314f6047dc05e6a2217074238347fd"; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.12.5.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz"; - sha1 = "d585cd9388ea06e6031e4cd44b6713cbead9e6cf"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz"; + sha1 = "f009a17543bbbbce16b06206ae73b63d3fca68d9"; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.12.1.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz"; - sha1 = "0f5ccda2945277a2a7a2d3a821e15395edcf3461"; + name = "_babel_helper_simple_access___helper_simple_access_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz"; + sha1 = "32427e5aa61547d38eb1e6eaf5fd1426fdad9136"; }; } { - name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.11.0.tgz"; + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.12.1.tgz"; path = fetchurl { - name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz"; - sha1 = "eec162f112c2f58d3af0af125e3bb57665146729"; + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; + sha1 = "462dc63a7e435ade8468385c63d2b84cce4b3cbf"; }; } { @@ -242,19 +242,27 @@ }; } { - name = "_babel_helper_wrap_function___helper_wrap_function_7.10.4.tgz"; + name = "_babel_helper_validator_option___helper_validator_option_7.12.1.tgz"; path = fetchurl { - name = "_babel_helper_wrap_function___helper_wrap_function_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz"; - sha1 = "8a6f701eab0ff39f765b5a1cfef409990e624b87"; + name = "_babel_helper_validator_option___helper_validator_option_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz"; + sha1 = "175567380c3e77d60ff98a54bb015fe78f2178d9"; }; } { - name = "_babel_helpers___helpers_7.10.4.tgz"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.12.3.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz"; - sha1 = "2abeb0d721aff7c0a97376b9e1f6f65d7a475044"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.12.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz"; + sha1 = "3332339fc4d1fbbf1c27d7958c27d34708e990d9"; + }; + } + { + name = "_babel_helpers___helpers_7.12.5.tgz"; + path = fetchurl { + name = "_babel_helpers___helpers_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz"; + sha1 = "1a1ba4a768d9b58310eda516c449913fe647116e"; }; } { @@ -266,19 +274,19 @@ }; } { - name = "_babel_parser___parser_7.11.5.tgz"; + name = "_babel_parser___parser_7.12.5.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.11.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz"; - sha1 = "c7ff6303df71080ec7a4f5b8c003c58f1cf51037"; + name = "_babel_parser___parser_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz"; + sha1 = "b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0"; }; } { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.10.5.tgz"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz"; - sha1 = "3491cabf2f7c179ab820606cec27fed15e0e8558"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz"; + sha1 = "dc6c1170e27d8aca99ff65f4925bd06b1c90550e"; }; } { @@ -290,11 +298,11 @@ }; } { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.10.4.tgz"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz"; - sha1 = "a33bf632da390a59c7a8c570045d1115cd778807"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz"; + sha1 = "a082ff541f2a29a4821065b8add9346c0c16e5de"; }; } { @@ -306,35 +314,35 @@ }; } { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.10.4.tgz"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz"; - sha1 = "ba57a26cb98b37741e9d5bca1b8b0ddf8291f17e"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz"; + sha1 = "43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc"; }; } { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.10.4.tgz"; + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz"; - sha1 = "570d883b91031637b3e2958eea3c438e62c05f54"; + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz"; + sha1 = "8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4"; }; } { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.10.4.tgz"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz"; - sha1 = "593e59c63528160233bd321b1aebe0820c2341db"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz"; + sha1 = "d45423b517714eedd5621a9dfdc03fa9f4eb241c"; }; } { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.11.0.tgz"; + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz"; - sha1 = "9f80e482c03083c87125dee10026b58527ea20c8"; + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz"; + sha1 = "f2c490d36e1b3c9659241034a5d2cd50263a2751"; }; } { @@ -346,11 +354,11 @@ }; } { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.10.4.tgz"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz"; - sha1 = "02a7e961fc32e6d5b2db0649e01bf80ddee7e04a"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz"; + sha1 = "3ed4fff31c015e7f3f1467f190dbe545cd7b046c"; }; } { @@ -362,27 +370,27 @@ }; } { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.10.4.tgz"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.5.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz"; - sha1 = "ce1590ff0a65ad12970a609d78855e9a4c1aef06"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz"; + sha1 = "b1ce757156d40ed79d59d467cb2b154a5c4149ba"; }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.11.0.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz"; - sha1 = "bd81f95a1f746760ea43b6c2d3d62b11790ad0af"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz"; + sha1 = "def9bd03cea0f9b72283dac0ec22d289c7691069"; }; } { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.10.4.tgz"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz"; - sha1 = "31c938309d24a78a49d68fdabffaa863758554dd"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz"; + sha1 = "ccc2421af64d3aae50b558a71cede929a5ab2942"; }; } { @@ -394,27 +402,27 @@ }; } { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.11.0.tgz"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz"; - sha1 = "de5866d0646f6afdaab8a566382fe3a221755076"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz"; + sha1 = "cce122203fc8a32794296fc377c6dedaf4363797"; }; } { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.10.4.tgz"; + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz"; - sha1 = "b160d972b8fdba5c7d111a145fc8c421fc2a6909"; + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz"; + sha1 = "86814f6e7a21374c980c10d38b4493e703f4a389"; }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.10.4.tgz"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz"; - sha1 = "4483cda53041ce3413b7fe2f00022665ddfaa75d"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz"; + sha1 = "2a183958d417765b9eae334f47758e5d6a82e072"; }; } { @@ -426,19 +434,19 @@ }; } { - name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.10.4.tgz"; + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz"; - sha1 = "6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c"; + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz"; + sha1 = "bcb297c5366e79bebadef509549cd93b04f19978"; }; } { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.10.4.tgz"; + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.4.tgz"; - sha1 = "6853085b2c429f9d322d02f5a635018cdeb2360c"; + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz"; + sha1 = "81a8b535b284476c41be6de06853a8802b98c5dd"; }; } { @@ -458,11 +466,11 @@ }; } { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.10.4.tgz"; + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.4.tgz"; - sha1 = "53351dd7ae01995e567d04ce42af1a6e0ba846a6"; + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.1.tgz"; + sha1 = "a77670d9abe6d63e8acadf4c31bb1eb5a506bbdd"; }; } { @@ -474,11 +482,11 @@ }; } { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.10.4.tgz"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz"; - sha1 = "39abaae3cbf710c4373d8429484e6ba21340166c"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz"; + sha1 = "9d9d357cc818aa7ae7935917c1257f67677a0926"; }; } { @@ -530,99 +538,99 @@ }; } { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.10.4.tgz"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz"; - sha1 = "4bbeb8917b54fcf768364e0a81f560e33a3ef57d"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz"; + sha1 = "dd6c0b357ac1bb142d98537450a319625d13d2a0"; }; } { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.10.4.tgz"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz"; - sha1 = "2f55e770d3501e83af217d782cb7517d7bb34d25"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz"; + sha1 = "460ba9d77077653803c3dd2e673f76d66b4029e5"; }; } { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.10.4.tgz"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz"; - sha1 = "e22960d77e697c74f41c501d44d73dbf8a6a64cd"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz"; + sha1 = "8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3"; }; } { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.10.4.tgz"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz"; - sha1 = "41a5017e49eb6f3cda9392a51eef29405b245a37"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz"; + sha1 = "3849a49cc2a22e9743cbd6b52926d30337229af1"; }; } { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.10.4.tgz"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz"; - sha1 = "1afa595744f75e43a91af73b0d998ecfe4ebc2e8"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz"; + sha1 = "f2a1a365bde2b7112e0a6ded9067fdd7c07905d9"; }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.11.1.tgz"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.11.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz"; - sha1 = "5b7efe98852bef8d652c0b28144cd93a9e4b5215"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz"; + sha1 = "f0ee727874b42a208a48a586b84c3d222c2bbef1"; }; } { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.10.4.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz"; - sha1 = "405136af2b3e218bc4a1926228bc917ab1a0adc7"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz"; + sha1 = "65e650fcaddd3d88ddce67c0f834a3d436a32db6"; }; } { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.10.4.tgz"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz"; - sha1 = "9ded83a816e82ded28d52d4b4ecbdd810cdfc0eb"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz"; + sha1 = "d68cf6c9b7f838a8a4144badbe97541ea0904852"; }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.10.4.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz"; - sha1 = "70ddd2b3d1bea83d01509e9bb25ddb3a74fc85e5"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz"; + sha1 = "b9a570fe0d0a8d460116413cb4f97e8e08b2f847"; }; } { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.10.4.tgz"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz"; - sha1 = "469c2062105c1eb6a040eaf4fac4b488078395ee"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz"; + sha1 = "a1d16c14862817b6409c0a678d6f9373ca9cd975"; }; } { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.10.4.tgz"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz"; - sha1 = "697e50c9fee14380fe843d1f306b295617431e47"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz"; + sha1 = "745661baba295ac06e686822797a69fbaa2ca228"; }; } { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.10.4.tgz"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz"; - sha1 = "5ae338c57f8cf4001bdb35607ae66b92d665af2e"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz"; + sha1 = "b0f2ed356ba1be1428ecaf128ff8a24f02830ae0"; }; } { @@ -634,115 +642,115 @@ }; } { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.10.4.tgz"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz"; - sha1 = "c08892e8819d3a5db29031b115af511dbbfebae9"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz"; + sha1 = "07640f28867ed16f9511c99c888291f560921cfa"; }; } { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.10.4.tgz"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz"; - sha1 = "6a467880e0fc9638514ba369111811ddbe2644b7"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz"; + sha1 = "2ec76258c70fe08c6d7da154003a480620eba667"; }; } { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.10.4.tgz"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz"; - sha1 = "9f42ba0841100a135f22712d0e391c462f571f3c"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz"; + sha1 = "d73b803a26b37017ddf9d3bb8f4dc58bfb806f57"; }; } { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.10.4.tgz"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz"; - sha1 = "b1ec44fcf195afcb8db2c62cd8e551c881baf8b7"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz"; + sha1 = "496038602daf1514a64d43d8e17cbb2755e0c3ad"; }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.10.5.tgz"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz"; - sha1 = "1b9cddaf05d9e88b3aad339cb3e445c4f020a9b1"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz"; + sha1 = "3154300b026185666eebb0c0ed7f8415fefcf6f9"; }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.4.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz"; - sha1 = "66667c3eeda1ebf7896d41f1f16b17105a2fbca0"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz"; + sha1 = "fa403124542636c786cf9b460a0ffbb48a86e648"; }; } { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.10.5.tgz"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz"; - sha1 = "6270099c854066681bae9e05f87e1b9cadbe8c85"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz"; + sha1 = "663fea620d593c93f214a464cd399bf6dc683086"; }; } { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.10.4.tgz"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz"; - sha1 = "9a8481fe81b824654b3a0b65da3df89f3d21839e"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz"; + sha1 = "eb5a218d6b1c68f3d6217b8fa2cc82fec6547902"; }; } { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.10.4.tgz"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz"; - sha1 = "78b4d978810b6f3bcf03f9e318f2fc0ed41aecb6"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz"; + sha1 = "b407f5c96be0d9f5f88467497fa82b30ac3e8753"; }; } { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.10.4.tgz"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz"; - sha1 = "9097d753cb7b024cb7381a3b2e52e9513a9c6888"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz"; + sha1 = "80073f02ee1bb2d365c3416490e085c95759dec0"; }; } { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.10.4.tgz"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz"; - sha1 = "d7146c4d139433e7a6526f888c667e314a093894"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz"; + sha1 = "4ea08696b8d2e65841d0c7706482b048bed1066e"; }; } { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.10.5.tgz"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz"; - sha1 = "59d339d58d0b1950435f4043e74e2510005e2c4a"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz"; + sha1 = "d2e963b038771650c922eff593799c96d853255d"; }; } { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.10.4.tgz"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz"; - sha1 = "f6fe54b6590352298785b83edd815d214c42e3c0"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz"; + sha1 = "41bc81200d730abb4456ab8b3fbd5537b59adecd"; }; } { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.10.4.tgz"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.10.4.tgz"; - sha1 = "0f485260bf1c29012bb973e7e404749eaac12c9e"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.12.1.tgz"; + sha1 = "4471f0851feec3231cc9aaa0dccde39947c1ac1e"; }; } { @@ -754,67 +762,67 @@ }; } { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.10.4.tgz"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.4.tgz"; - sha1 = "b5795f4e3e3140419c3611b7a2a3832b9aef328d"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz"; + sha1 = "1cbcd0c3b1d6648c55374a22fc9b6b7e5341c00d"; }; } { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.11.5.tgz"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.11.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.11.5.tgz"; - sha1 = "e1439e6a57ee3d43e9f54ace363fb29cefe5d7b6"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.5.tgz"; + sha1 = "677de5b96da310430d6cfb7fee16a1603afa3d56"; }; } { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.10.4.tgz"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.4.tgz"; - sha1 = "cd301a5fed8988c182ed0b9d55e9bd6db0bd9369"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz"; + sha1 = "ef43cbca2a14f1bd17807dbe4376ff89d714cf28"; }; } { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.10.5.tgz"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.5.tgz"; - sha1 = "34f1779117520a779c054f2cdd9680435b9222b4"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz"; + sha1 = "d07de6863f468da0809edcf79a1aa8ce2a82a26b"; }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.10.4.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.12.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz"; - sha1 = "673c9f913948764a4421683b2bef2936968fddf2"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.5.tgz"; + sha1 = "39ede0e30159770561b6963be143e40af3bde00c"; }; } { - name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.10.4.tgz"; + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.4.tgz"; - sha1 = "3eefbb73db94afbc075f097523e445354a1c6501"; + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz"; + sha1 = "05d46f0ab4d1339ac59adf20a1462c91b37a1a42"; }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.10.4.tgz"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz"; - sha1 = "2015e59d839074e76838de2159db421966fd8b63"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz"; + sha1 = "5f0a28d842f6462281f06a964e88ba8d7ab49753"; }; } { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.10.4.tgz"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz"; - sha1 = "8f2682bcdcef9ed327e1b0861585d7013f8a54dd"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz"; + sha1 = "6fdfc8cc7edcc42b36a7c12188c6787c873adcd8"; }; } { @@ -826,67 +834,67 @@ }; } { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.10.4.tgz"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz"; - sha1 = "9fd25ec5cdd555bb7f473e5e6ee1c971eede4dd6"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz"; + sha1 = "0bf9cac5550fce0cfdf043420f661d645fdc75e3"; }; } { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.11.0.tgz"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz"; - sha1 = "fa84d300f5e4f57752fe41a6d1b3c554f13f17cc"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz"; + sha1 = "527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e"; }; } { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.10.4.tgz"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz"; - sha1 = "8f3889ee8657581130a29d9cc91d7c73b7c4a28d"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz"; + sha1 = "5c24cf50de396d30e99afc8d1c700e8bce0f5caf"; }; } { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.10.5.tgz"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz"; - sha1 = "78bc5d626a6642db3312d9d0f001f5e7639fde8c"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz"; + sha1 = "b43ece6ed9a79c0c71119f576d299ef09d942843"; }; } { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.10.4.tgz"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz"; - sha1 = "9509f1a7eec31c4edbffe137c16cc33ff0bc5bfc"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz"; + sha1 = "9ca6be343d42512fbc2e68236a82ae64bc7af78a"; }; } { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.11.0.tgz"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz"; - sha1 = "2b4879676af37342ebb278216dd090ac67f13abb"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz"; + sha1 = "d92cc0af504d510e26a754a7dbc2e5c8cd9c7ab4"; }; } { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.10.4.tgz"; + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz"; - sha1 = "feae523391c7651ddac115dae0a9d06857892007"; + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz"; + sha1 = "5232b9f81ccb07070b7c3c36c67a1b78f1845709"; }; } { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.10.4.tgz"; + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz"; - sha1 = "e56d71f9282fac6db09c82742055576d5e6d80a8"; + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz"; + sha1 = "cc9661f61390db5c65e3febaccefd5c6ac3faecb"; }; } { @@ -898,11 +906,11 @@ }; } { - name = "_babel_preset_env___preset_env_7.11.5.tgz"; + name = "_babel_preset_env___preset_env_7.12.1.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.11.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.5.tgz"; - sha1 = "18cb4b9379e3e92ffea92c07471a99a2914e4272"; + name = "_babel_preset_env___preset_env_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz"; + sha1 = "9c7e5ca82a19efc865384bb4989148d2ee5d7ac2"; }; } { @@ -922,11 +930,11 @@ }; } { - name = "_babel_preset_react___preset_react_7.10.4.tgz"; + name = "_babel_preset_react___preset_react_7.12.5.tgz"; path = fetchurl { - name = "_babel_preset_react___preset_react_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.4.tgz"; - sha1 = "92e8a66d816f9911d11d4cc935be67adfc82dbcf"; + name = "_babel_preset_react___preset_react_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.5.tgz"; + sha1 = "d45625f65d53612078a43867c5c6750e78772c56"; }; } { @@ -938,11 +946,11 @@ }; } { - name = "_babel_runtime_corejs3___runtime_corejs3_7.11.2.tgz"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.12.5.tgz"; path = fetchurl { - name = "_babel_runtime_corejs3___runtime_corejs3_7.11.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz"; - sha1 = "02c3029743150188edeb66541195f54600278419"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.12.5.tgz"; + sha1 = "ffee91da0eb4c6dae080774e94ba606368e414f4"; }; } { @@ -954,11 +962,11 @@ }; } { - name = "_babel_runtime___runtime_7.11.2.tgz"; + name = "_babel_runtime___runtime_7.12.5.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.11.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz"; - sha1 = "f549c13c754cc40b87644b9fa9f09a6a95fe0736"; + name = "_babel_runtime___runtime_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz"; + sha1 = "410e7e487441e1b360c29be715d870d9b985882e"; }; } { @@ -970,19 +978,19 @@ }; } { - name = "_babel_traverse___traverse_7.11.5.tgz"; + name = "_babel_traverse___traverse_7.12.5.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.11.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz"; - sha1 = "be777b93b518eb6d76ee2e1ea1d143daa11e61c3"; + name = "_babel_traverse___traverse_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.5.tgz"; + sha1 = "78a0c68c8e8a35e4cacfd31db8bb303d5606f095"; }; } { - name = "_babel_types___types_7.11.5.tgz"; + name = "_babel_types___types_7.12.6.tgz"; path = fetchurl { - name = "_babel_types___types_7.11.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz"; - sha1 = "d9de577d01252d77c6800cee039ee64faf75662d"; + name = "_babel_types___types_7.12.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.12.6.tgz"; + sha1 = "ae0e55ef1cce1fbc881cd26f8234eb3e657edc96"; }; } { @@ -1034,11 +1042,11 @@ }; } { - name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.11.tgz"; + name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.12.tgz"; path = fetchurl { - name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.11.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.11.tgz"; - sha1 = "c1a95a2bdb6a18fa97b355a563832e248bf6ef4a"; + name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.12.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.12.tgz"; + sha1 = "fbdea86e8b73032895e6ded1ee1dbb1874902d1a"; }; } { @@ -1162,11 +1170,11 @@ }; } { - name = "_jest_types___types_25.5.0.tgz"; + name = "_jest_types___types_26.6.2.tgz"; path = fetchurl { - name = "_jest_types___types_25.5.0.tgz"; - url = "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz"; - sha1 = "4d6a4793f7b9599fc3680877b856a97dbccf2a9d"; + name = "_jest_types___types_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz"; + sha1 = "bef5a532030e1d88a2f5a6d933f84e97226ed48e"; }; } { @@ -1218,11 +1226,11 @@ }; } { - name = "_sinonjs_samsam___samsam_5.2.0.tgz"; + name = "_sinonjs_samsam___samsam_5.3.0.tgz"; path = fetchurl { - name = "_sinonjs_samsam___samsam_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.2.0.tgz"; - sha1 = "fcff83ab86f83b5498f4a967869c079408d9b5eb"; + name = "_sinonjs_samsam___samsam_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.0.tgz"; + sha1 = "1d2f0743dc54bf13fe9d508baefacdffa25d4329"; }; } { @@ -1354,11 +1362,11 @@ }; } { - name = "_types_babel__core___babel__core_7.1.10.tgz"; + name = "_types_babel__core___babel__core_7.1.12.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.10.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.10.tgz"; - sha1 = "ca58fc195dd9734e77e57c6f2df565623636ab40"; + name = "_types_babel__core___babel__core_7.1.12.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz"; + sha1 = "4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"; }; } { @@ -1370,11 +1378,11 @@ }; } { - name = "_types_babel__template___babel__template_7.0.3.tgz"; + name = "_types_babel__template___babel__template_7.4.0.tgz"; path = fetchurl { - name = "_types_babel__template___babel__template_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.3.tgz"; - sha1 = "b8aaeba0a45caca7b56a5de9459872dde3727214"; + name = "_types_babel__template___babel__template_7.4.0.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz"; + sha1 = "0c888dd70b3ee9eebb6e4f200e809da0076262be"; }; } { @@ -1402,11 +1410,11 @@ }; } { - name = "_types_enzyme___enzyme_3.10.7.tgz"; + name = "_types_enzyme___enzyme_3.10.8.tgz"; path = fetchurl { - name = "_types_enzyme___enzyme_3.10.7.tgz"; - url = "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.7.tgz"; - sha1 = "ebdf3b972d293095e09af479e36c772025285e3a"; + name = "_types_enzyme___enzyme_3.10.8.tgz"; + url = "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.8.tgz"; + sha1 = "ad7ac9d3af3de6fd0673773123fafbc63db50d42"; }; } { @@ -1466,19 +1474,27 @@ }; } { - name = "_types_jest___jest_26.0.14.tgz"; + name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz"; + path = fetchurl { + name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz"; + sha1 = "508b13aa344fa4976234e75dddcc34925737d821"; + }; + } + { + name = "_types_jest___jest_26.0.15.tgz"; path = fetchurl { - name = "_types_jest___jest_26.0.14.tgz"; - url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.14.tgz"; - sha1 = "078695f8f65cb55c5a98450d65083b2b73e5a3f3"; + name = "_types_jest___jest_26.0.15.tgz"; + url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.15.tgz"; + sha1 = "12e02c0372ad0548e07b9f4e19132b834cb1effe"; }; } { - name = "_types_jquery___jquery_3.5.2.tgz"; + name = "_types_jquery___jquery_3.5.4.tgz"; path = fetchurl { - name = "_types_jquery___jquery_3.5.2.tgz"; - url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.2.tgz"; - sha1 = "e17c1756ecf7bbb431766c6761674a5d1de16579"; + name = "_types_jquery___jquery_3.5.4.tgz"; + url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.4.tgz"; + sha1 = "e923f7d05ca790530f17f80a3b89bc28853fa17f"; }; } { @@ -1514,19 +1530,19 @@ }; } { - name = "_types_node___node_14.11.5.tgz"; + name = "_types_node___node_14.14.8.tgz"; path = fetchurl { - name = "_types_node___node_14.11.5.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.11.5.tgz"; - sha1 = "fecad41c041cae7f2404ad4b2d0742fdb628b305"; + name = "_types_node___node_14.14.8.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.8.tgz"; + sha1 = "2127bd81949a95c8b7d3240f3254352d72563aec"; }; } { - name = "_types_node___node_12.12.64.tgz"; + name = "_types_node___node_12.19.5.tgz"; path = fetchurl { - name = "_types_node___node_12.12.64.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.12.64.tgz"; - sha1 = "e3b336dc4c6ba52c6b59e3bd69a100347c20b1c0"; + name = "_types_node___node_12.19.5.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-12.19.5.tgz"; + sha1 = "9be3946136e818597c71c62d04240d0602c645d4"; }; } { @@ -1570,11 +1586,11 @@ }; } { - name = "_types_react_dom___react_dom_16.9.8.tgz"; + name = "_types_react_dom___react_dom_16.9.9.tgz"; path = fetchurl { - name = "_types_react_dom___react_dom_16.9.8.tgz"; - url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz"; - sha1 = "fe4c1e11dfc67155733dfa6aa65108b4971cb423"; + name = "_types_react_dom___react_dom_16.9.9.tgz"; + url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.9.tgz"; + sha1 = "d2d0a6f720a0206369ccbefff752ba37b9583136"; }; } { @@ -1594,19 +1610,19 @@ }; } { - name = "_types_react___react_16.9.51.tgz"; + name = "_types_react___react_16.9.56.tgz"; path = fetchurl { - name = "_types_react___react_16.9.51.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.51.tgz"; - sha1 = "f8aa51ffa9996f1387f63686696d9b59713d2b60"; + name = "_types_react___react_16.9.56.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.56.tgz"; + sha1 = "ea25847b53c5bec064933095fc366b1462e2adf0"; }; } { - name = "_types_reactstrap___reactstrap_8.5.1.tgz"; + name = "_types_reactstrap___reactstrap_8.7.2.tgz"; path = fetchurl { - name = "_types_reactstrap___reactstrap_8.5.1.tgz"; - url = "https://registry.yarnpkg.com/@types/reactstrap/-/reactstrap-8.5.1.tgz"; - sha1 = "bd01ed7b14b9aeb476c0b8e195443dda98ac6156"; + name = "_types_reactstrap___reactstrap_8.7.2.tgz"; + url = "https://registry.yarnpkg.com/@types/reactstrap/-/reactstrap-8.7.2.tgz"; + sha1 = "0ab86f35e472e8f2002eaf8c7a42193c9cea6add"; }; } { @@ -1674,11 +1690,11 @@ }; } { - name = "_types_yargs___yargs_15.0.7.tgz"; + name = "_types_yargs___yargs_15.0.10.tgz"; path = fetchurl { - name = "_types_yargs___yargs_15.0.7.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.7.tgz"; - sha1 = "dad50a7a234a35ef9460737a56024287a3de1d2b"; + name = "_types_yargs___yargs_15.0.10.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.10.tgz"; + sha1 = "0fe3c8173a0d5c3e780b389050140c3f5ea6ea74"; }; } { @@ -2002,11 +2018,11 @@ }; } { - name = "ajv___ajv_6.12.5.tgz"; + name = "ajv___ajv_6.12.6.tgz"; path = fetchurl { - name = "ajv___ajv_6.12.5.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz"; - sha1 = "19b0e8bae8f476e5ba666300387775fb1a00a4da"; + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; }; } { @@ -2258,19 +2274,19 @@ }; } { - name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; + name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz"; path = fetchurl { - name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz"; - sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b"; + name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz"; + sha1 = "6ef638b43312bd401b4c6199fdec7e2dc9e9a123"; }; } { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.4.tgz"; path = fetchurl { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz"; - sha1 = "1c13f84a178566042dd63de4414440db9222e443"; + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz"; + sha1 = "94cfd47cc1556ec0747d97f7c7738c58122004c9"; }; } { @@ -2410,19 +2426,19 @@ }; } { - name = "aws4___aws4_1.10.1.tgz"; + name = "aws4___aws4_1.11.0.tgz"; path = fetchurl { - name = "aws4___aws4_1.10.1.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz"; - sha1 = "e1e82e4f3e999e2cfd61b161280d16a111f86428"; + name = "aws4___aws4_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz"; + sha1 = "d61f46d83b2519250e2784daf5b09479a8b41c59"; }; } { - name = "axe_core___axe_core_3.5.5.tgz"; + name = "axe_core___axe_core_4.1.0.tgz"; path = fetchurl { - name = "axe_core___axe_core_3.5.5.tgz"; - url = "https://registry.yarnpkg.com/axe-core/-/axe-core-3.5.5.tgz"; - sha1 = "84315073b53fa3c0c51676c588d59da09a192227"; + name = "axe_core___axe_core_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.0.tgz"; + sha1 = "93d395e6262ecdde5cb52a5d06533d0a0c7bb4cd"; }; } { @@ -2506,11 +2522,11 @@ }; } { - name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.6.tgz"; + name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.7.tgz"; path = fetchurl { - name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.6.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.6.tgz"; - sha1 = "c9750a1b38d85112c9e166bf3ef7c5dbc605f4be"; + name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.7.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz"; + sha1 = "156cd55d3f1228a5765774340937afc8398067dd"; }; } { @@ -2578,11 +2594,11 @@ }; } { - name = "base64_js___base64_js_1.3.1.tgz"; + name = "base64_js___base64_js_1.5.1.tgz"; path = fetchurl { - name = "base64_js___base64_js_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz"; - sha1 = "58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"; + name = "base64_js___base64_js_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; + sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; }; } { @@ -2690,11 +2706,11 @@ }; } { - name = "bootstrap___bootstrap_4.5.2.tgz"; + name = "bootstrap___bootstrap_4.5.3.tgz"; path = fetchurl { - name = "bootstrap___bootstrap_4.5.2.tgz"; - url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.2.tgz"; - sha1 = "a85c4eda59155f0d71186b6e6ad9b875813779ab"; + name = "bootstrap___bootstrap_4.5.3.tgz"; + url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.3.tgz"; + sha1 = "c6a72b355aaf323920be800246a6e4ef30997fe6"; }; } { @@ -2770,11 +2786,11 @@ }; } { - name = "browserify_rsa___browserify_rsa_4.0.1.tgz"; + name = "browserify_rsa___browserify_rsa_4.1.0.tgz"; path = fetchurl { - name = "browserify_rsa___browserify_rsa_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; - sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; + name = "browserify_rsa___browserify_rsa_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz"; + sha1 = "b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"; }; } { @@ -2802,11 +2818,11 @@ }; } { - name = "browserslist___browserslist_4.14.5.tgz"; + name = "browserslist___browserslist_4.14.7.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.14.5.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz"; - sha1 = "1c751461a102ddc60e40993639b709be7f2c4015"; + name = "browserslist___browserslist_4.14.7.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz"; + sha1 = "c071c1b3622c1c2e790799a37bb09473a4351cb6"; }; } { @@ -2898,6 +2914,14 @@ }; } { + name = "call_bind___call_bind_1.0.0.tgz"; + path = fetchurl { + name = "call_bind___call_bind_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz"; + sha1 = "24127054bb3f9bdcb4b1fb82418186072f77b8ce"; + }; + } + { name = "call_me_maybe___call_me_maybe_1.0.1.tgz"; path = fetchurl { name = "call_me_maybe___call_me_maybe_1.0.1.tgz"; @@ -2970,11 +2994,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001146.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001159.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001146.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001146.tgz"; - sha1 = "c61fcb1474520c1462913689201fb292ba6f447c"; + name = "caniuse_lite___caniuse_lite_1.0.30001159.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz"; + sha1 = "bebde28f893fa9594dadcaa7d6b8e2aa0299df20"; }; } { @@ -3018,14 +3042,6 @@ }; } { - name = "chalk___chalk_3.0.0.tgz"; - path = fetchurl { - name = "chalk___chalk_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; - sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; - }; - } - { name = "chalk___chalk_4.1.0.tgz"; path = fetchurl { name = "chalk___chalk_4.1.0.tgz"; @@ -3058,11 +3074,11 @@ }; } { - name = "chokidar___chokidar_3.4.2.tgz"; + name = "chokidar___chokidar_3.4.3.tgz"; path = fetchurl { - name = "chokidar___chokidar_3.4.2.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz"; - sha1 = "38dc8e658dec3809741eb3ef7bb0a47fe424232d"; + name = "chokidar___chokidar_3.4.3.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz"; + sha1 = "c1df38231448e45ca4ac588e6c79573ba6a57d5b"; }; } { @@ -3234,19 +3250,19 @@ }; } { - name = "color_string___color_string_1.5.3.tgz"; + name = "color_string___color_string_1.5.4.tgz"; path = fetchurl { - name = "color_string___color_string_1.5.3.tgz"; - url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz"; - sha1 = "c9bbc5f01b58b5492f3d6857459cb6590ce204cc"; + name = "color_string___color_string_1.5.4.tgz"; + url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz"; + sha1 = "dd51cd25cfee953d138fe4002372cc3d0e504cb6"; }; } { - name = "color___color_3.1.2.tgz"; + name = "color___color_3.1.3.tgz"; path = fetchurl { - name = "color___color_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz"; - sha1 = "68148e7f85d41ad7649c5fa8c8106f098d229e10"; + name = "color___color_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz"; + sha1 = "ca67fb4e7b97d611dcde39eceed422067d91596e"; }; } { @@ -3354,11 +3370,11 @@ }; } { - name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz"; + name = "confusing_browser_globals___confusing_browser_globals_1.0.10.tgz"; path = fetchurl { - name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz"; - url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz"; - sha1 = "72bc13b483c0276801681871d4898516f8f54fdd"; + name = "confusing_browser_globals___confusing_browser_globals_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz"; + sha1 = "30d1e7f3d1b882b25ec4933d1d1adac353d20a59"; }; } { @@ -3466,19 +3482,19 @@ }; } { - name = "core_js_compat___core_js_compat_3.6.5.tgz"; + name = "core_js_compat___core_js_compat_3.7.0.tgz"; path = fetchurl { - name = "core_js_compat___core_js_compat_3.6.5.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz"; - sha1 = "2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"; + name = "core_js_compat___core_js_compat_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.7.0.tgz"; + sha1 = "8479c5d3d672d83f1f5ab94cf353e57113e065ed"; }; } { - name = "core_js_pure___core_js_pure_3.6.5.tgz"; + name = "core_js_pure___core_js_pure_3.7.0.tgz"; path = fetchurl { - name = "core_js_pure___core_js_pure_3.6.5.tgz"; - url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz"; - sha1 = "c79e75f5e38dbc85a662d91eea52b8256d53b813"; + name = "core_js_pure___core_js_pure_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.7.0.tgz"; + sha1 = "28a57c861d5698e053f0ff36905f7a3301b4191e"; }; } { @@ -3490,11 +3506,11 @@ }; } { - name = "core_js___core_js_3.6.5.tgz"; + name = "core_js___core_js_3.7.0.tgz"; path = fetchurl { - name = "core_js___core_js_3.6.5.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz"; - sha1 = "7395dc273af37fb2e50e9bd3d9fe841285231d1a"; + name = "core_js___core_js_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.7.0.tgz"; + sha1 = "b0a761a02488577afbf97179e4681bf49568520f"; }; } { @@ -3666,11 +3682,11 @@ }; } { - name = "css_tree___css_tree_1.0.0_alpha.39.tgz"; + name = "css_tree___css_tree_1.1.1.tgz"; path = fetchurl { - name = "css_tree___css_tree_1.0.0_alpha.39.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.39.tgz"; - sha1 = "2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb"; + name = "css_tree___css_tree_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.1.tgz"; + sha1 = "30b8c0161d9fb4e9e2141d762589b6ec2faebd2e"; }; } { @@ -3682,11 +3698,11 @@ }; } { - name = "css_what___css_what_3.4.1.tgz"; + name = "css_what___css_what_3.4.2.tgz"; path = fetchurl { - name = "css_what___css_what_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/css-what/-/css-what-3.4.1.tgz"; - sha1 = "81cb70b609e4b1351b1e54cbc90fd9c54af86e2e"; + name = "css_what___css_what_3.4.2.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz"; + sha1 = "ea7026fcb01777edbde52124e21f327e7ae950e4"; }; } { @@ -3778,11 +3794,11 @@ }; } { - name = "csso___csso_4.0.3.tgz"; + name = "csso___csso_4.1.1.tgz"; path = fetchurl { - name = "csso___csso_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz"; - sha1 = "0d9985dc852c7cc2b2cacfbbe1079014d1a8e903"; + name = "csso___csso_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/csso/-/csso-4.1.1.tgz"; + sha1 = "e0cb02d6eb3af1df719222048e4359efd662af13"; }; } { @@ -3818,11 +3834,11 @@ }; } { - name = "csstype___csstype_3.0.3.tgz"; + name = "csstype___csstype_3.0.5.tgz"; path = fetchurl { - name = "csstype___csstype_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.3.tgz"; - sha1 = "2b410bbeba38ba9633353aff34b05d9755d065f8"; + name = "csstype___csstype_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.5.tgz"; + sha1 = "7fdec6a28a67ae18647c51668a9ff95bb2fa7bb8"; }; } { @@ -3882,19 +3898,19 @@ }; } { - name = "debug___debug_3.2.6.tgz"; + name = "debug___debug_3.2.7.tgz"; path = fetchurl { - name = "debug___debug_3.2.6.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz"; - sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b"; + name = "debug___debug_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz"; + sha1 = "72580b7e9145fb39b6676f9c5e5fb100b934179a"; }; } { - name = "debug___debug_4.2.0.tgz"; + name = "debug___debug_4.3.1.tgz"; path = fetchurl { - name = "debug___debug_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz"; - sha1 = "7f150f93920e94c58f5574c2fd01a3110effe7f1"; + name = "debug___debug_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; + sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; }; } { @@ -4050,11 +4066,11 @@ }; } { - name = "diff_sequences___diff_sequences_25.2.6.tgz"; + name = "diff_sequences___diff_sequences_26.6.2.tgz"; path = fetchurl { - name = "diff_sequences___diff_sequences_25.2.6.tgz"; - url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz"; - sha1 = "5f467c00edd35352b7bca46d7927d60e687a76dd"; + name = "diff_sequences___diff_sequences_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz"; + sha1 = "48ba99157de1923412eed41db6b6d4aa9ca7c0b1"; }; } { @@ -4330,11 +4346,11 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.578.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.601.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.578.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.578.tgz"; - sha1 = "e6671936f4571a874eb26e2e833aa0b2c0b776e0"; + name = "electron_to_chromium___electron_to_chromium_1.3.601.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.601.tgz"; + sha1 = "881824eaef0b2f97c89e1abb5835fdd224997d34"; }; } { @@ -4362,11 +4378,11 @@ }; } { - name = "emoji_regex___emoji_regex_9.0.0.tgz"; + name = "emoji_regex___emoji_regex_9.2.0.tgz"; path = fetchurl { - name = "emoji_regex___emoji_regex_9.0.0.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.0.0.tgz"; - sha1 = "48a2309cc8a1d2e9d23bc6a67c39b63032e76ea4"; + name = "emoji_regex___emoji_regex_9.2.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.0.tgz"; + sha1 = "a26da8e832b16a9753309f25e35e3c0efb9a066a"; }; } { @@ -4418,11 +4434,11 @@ }; } { - name = "entities___entities_2.0.3.tgz"; + name = "entities___entities_2.1.0.tgz"; path = fetchurl { - name = "entities___entities_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz"; - sha1 = "5c487e5742ab93c15abb5da22759b8590ec03b7f"; + name = "entities___entities_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz"; + sha1 = "992d3129cf7df6870b96c57858c249a120f8b8b5"; }; } { @@ -4530,11 +4546,11 @@ }; } { - name = "escalade___escalade_3.1.0.tgz"; + name = "escalade___escalade_3.1.1.tgz"; path = fetchurl { - name = "escalade___escalade_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz"; - sha1 = "e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e"; + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; }; } { @@ -4570,11 +4586,11 @@ }; } { - name = "eslint_config_prettier___eslint_config_prettier_6.12.0.tgz"; + name = "eslint_config_prettier___eslint_config_prettier_6.15.0.tgz"; path = fetchurl { - name = "eslint_config_prettier___eslint_config_prettier_6.12.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz"; - sha1 = "9eb2bccff727db1c52104f0b49e87ea46605a0d2"; + name = "eslint_config_prettier___eslint_config_prettier_6.15.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz"; + sha1 = "7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9"; }; } { @@ -4650,11 +4666,11 @@ }; } { - name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.3.1.tgz"; + name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.4.1.tgz"; path = fetchurl { - name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.3.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.3.1.tgz"; - sha1 = "99ef7e97f567cc6a5b8dd5ab95a94a67058a2660"; + name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.4.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz"; + sha1 = "a2d84caa49756942f42f1ffab9002436391718fd"; }; } { @@ -4690,11 +4706,11 @@ }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.21.3.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.21.5.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.21.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.21.3.tgz"; - sha1 = "71655d2af5155b19285ec929dd2cdc67a4470b52"; + name = "eslint_plugin_react___eslint_plugin_react_7.21.5.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.21.5.tgz"; + sha1 = "50b21a412b9574bfe05b21db176e8b7b3b15bff3"; }; } { @@ -5378,11 +5394,11 @@ }; } { - name = "gensync___gensync_1.0.0_beta.1.tgz"; + name = "gensync___gensync_1.0.0_beta.2.tgz"; path = fetchurl { - name = "gensync___gensync_1.0.0_beta.1.tgz"; - url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz"; - sha1 = "58f4361ff987e5ff6e1e7a210827aa371eaac269"; + name = "gensync___gensync_1.0.0_beta.2.tgz"; + url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz"; + sha1 = "32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"; }; } { @@ -5394,6 +5410,14 @@ }; } { + name = "get_intrinsic___get_intrinsic_1.0.1.tgz"; + path = fetchurl { + name = "get_intrinsic___get_intrinsic_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz"; + sha1 = "94a9768fcbdd0595a1c9273aacf4c89d075631be"; + }; + } + { name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; path = fetchurl { name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; @@ -5906,11 +5930,11 @@ }; } { - name = "ieee754___ieee754_1.1.13.tgz"; + name = "ieee754___ieee754_1.2.1.tgz"; path = fetchurl { - name = "ieee754___ieee754_1.1.13.tgz"; - url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz"; - sha1 = "ec168558e95aa181fd87d37f55c32bbcb6708b84"; + name = "ieee754___ieee754_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; + sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; }; } { @@ -5962,11 +5986,11 @@ }; } { - name = "import_fresh___import_fresh_3.2.1.tgz"; + name = "import_fresh___import_fresh_3.2.2.tgz"; path = fetchurl { - name = "import_fresh___import_fresh_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; - sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; + name = "import_fresh___import_fresh_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz"; + sha1 = "fc129c160c5d68235507f4331a6baad186bdbc3e"; }; } { @@ -6234,6 +6258,14 @@ }; } { + name = "is_core_module___is_core_module_2.1.0.tgz"; + path = fetchurl { + name = "is_core_module___is_core_module_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz"; + sha1 = "a4cc031d9b1aca63eecbd18a650e13cb4eeab946"; + }; + } + { name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; path = fetchurl { name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; @@ -6674,11 +6706,11 @@ }; } { - name = "jest_diff___jest_diff_25.5.0.tgz"; + name = "jest_diff___jest_diff_26.6.2.tgz"; path = fetchurl { - name = "jest_diff___jest_diff_25.5.0.tgz"; - url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz"; - sha1 = "1dd26ed64f96667c068cef026b677dfa01afcfa9"; + name = "jest_diff___jest_diff_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz"; + sha1 = "1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"; }; } { @@ -6738,11 +6770,11 @@ }; } { - name = "jest_get_type___jest_get_type_25.2.6.tgz"; + name = "jest_get_type___jest_get_type_26.3.0.tgz"; path = fetchurl { - name = "jest_get_type___jest_get_type_25.2.6.tgz"; - url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz"; - sha1 = "0b0a32fab8908b44d508be81681487dbabb8d877"; + name = "jest_get_type___jest_get_type_26.3.0.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz"; + sha1 = "e97dc3c3f53c2b406ca7afaed4493b1d099199e0"; }; } { @@ -7114,6 +7146,14 @@ }; } { + name = "jsx_ast_utils___jsx_ast_utils_3.1.0.tgz"; + path = fetchurl { + name = "jsx_ast_utils___jsx_ast_utils_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz"; + sha1 = "642f1d7b88aa6d7eb9d8f2210e166478444fa891"; + }; + } + { name = "just_extend___just_extend_4.1.1.tgz"; path = fetchurl { name = "just_extend___just_extend_4.1.1.tgz"; @@ -7178,11 +7218,11 @@ }; } { - name = "language_subtag_registry___language_subtag_registry_0.3.20.tgz"; + name = "language_subtag_registry___language_subtag_registry_0.3.21.tgz"; path = fetchurl { - name = "language_subtag_registry___language_subtag_registry_0.3.20.tgz"; - url = "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.20.tgz"; - sha1 = "a00a37121894f224f763268e431c55556b0c0755"; + name = "language_subtag_registry___language_subtag_registry_0.3.21.tgz"; + url = "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz"; + sha1 = "04ac218bea46f04cb039084602c6da9e788dd45a"; }; } { @@ -7506,19 +7546,19 @@ }; } { - name = "mdn_data___mdn_data_2.0.4.tgz"; + name = "mdn_data___mdn_data_2.0.14.tgz"; path = fetchurl { - name = "mdn_data___mdn_data_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz"; - sha1 = "699b3c38ac6f1d728091a64650b65d388502fd5b"; + name = "mdn_data___mdn_data_2.0.14.tgz"; + url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz"; + sha1 = "7113fc4281917d63ce29b43446f701e68c25ba50"; }; } { - name = "mdn_data___mdn_data_2.0.6.tgz"; + name = "mdn_data___mdn_data_2.0.4.tgz"; path = fetchurl { - name = "mdn_data___mdn_data_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz"; - sha1 = "852dc60fcaa5daa2e8cf6c9189c440ed3e042978"; + name = "mdn_data___mdn_data_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz"; + sha1 = "699b3c38ac6f1d728091a64650b65d388502fd5b"; }; } { @@ -7762,11 +7802,11 @@ }; } { - name = "moment_timezone___moment_timezone_0.5.31.tgz"; + name = "moment_timezone___moment_timezone_0.5.32.tgz"; path = fetchurl { - name = "moment_timezone___moment_timezone_0.5.31.tgz"; - url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.31.tgz"; - sha1 = "9c40d8c5026f0c7ab46eda3d63e49c155148de05"; + name = "moment_timezone___moment_timezone_0.5.32.tgz"; + url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.32.tgz"; + sha1 = "db7677cc3cc680fd30303ebd90b0da1ca0dfecc2"; }; } { @@ -7850,11 +7890,11 @@ }; } { - name = "nan___nan_2.14.1.tgz"; + name = "nan___nan_2.14.2.tgz"; path = fetchurl { - name = "nan___nan_2.14.1.tgz"; - url = "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz"; - sha1 = "d7be34dfa3105b91494c3147089315eff8874b01"; + name = "nan___nan_2.14.2.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz"; + sha1 = "f5376400695168f4cc694ac9393d0c9585eeea19"; }; } { @@ -7978,11 +8018,11 @@ }; } { - name = "node_releases___node_releases_1.1.61.tgz"; + name = "node_releases___node_releases_1.1.67.tgz"; path = fetchurl { - name = "node_releases___node_releases_1.1.61.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz"; - sha1 = "707b0fca9ce4e11783612ba4a2fcba09047af16e"; + name = "node_releases___node_releases_1.1.67.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz"; + sha1 = "28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"; }; } { @@ -8138,11 +8178,11 @@ }; } { - name = "object.assign___object.assign_4.1.1.tgz"; + name = "object.assign___object.assign_4.1.2.tgz"; path = fetchurl { - name = "object.assign___object.assign_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz"; - sha1 = "303867a666cdd41936ecdedfb1f8f3e32a478cdd"; + name = "object.assign___object.assign_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz"; + sha1 = "0ed54a342eceb37b38ff76eb831a0e788cb63940"; }; } { @@ -8970,11 +9010,11 @@ }; } { - name = "postcss_font_variant___postcss_font_variant_4.0.0.tgz"; + name = "postcss_font_variant___postcss_font_variant_4.0.1.tgz"; path = fetchurl { - name = "postcss_font_variant___postcss_font_variant_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-4.0.0.tgz"; - sha1 = "71dd3c6c10a0d846c5eda07803439617bbbabacc"; + name = "postcss_font_variant___postcss_font_variant_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz"; + sha1 = "42d4c0ab30894f60f98b17561eb5c0321f502641"; }; } { @@ -9426,11 +9466,11 @@ }; } { - name = "pretty_error___pretty_error_2.1.1.tgz"; + name = "pretty_error___pretty_error_2.1.2.tgz"; path = fetchurl { - name = "pretty_error___pretty_error_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz"; - sha1 = "5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"; + name = "pretty_error___pretty_error_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz"; + sha1 = "be89f82d81b1c86ec8fdfbc385045882727f93b6"; }; } { @@ -9442,11 +9482,11 @@ }; } { - name = "pretty_format___pretty_format_25.5.0.tgz"; + name = "pretty_format___pretty_format_26.6.2.tgz"; path = fetchurl { - name = "pretty_format___pretty_format_25.5.0.tgz"; - url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz"; - sha1 = "7873c1d774f682c34b8d48b6743a2bf2ac55791a"; + name = "pretty_format___pretty_format_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz"; + sha1 = "e35c2705f14cb7fe2fe94fa078345b444120fc93"; }; } { @@ -9482,11 +9522,11 @@ }; } { - name = "promise_polyfill___promise_polyfill_8.1.3.tgz"; + name = "promise_polyfill___promise_polyfill_8.2.0.tgz"; path = fetchurl { - name = "promise_polyfill___promise_polyfill_8.1.3.tgz"; - url = "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.1.3.tgz"; - sha1 = "8c99b3cf53f3a91c68226ffde7bde81d7f904116"; + name = "promise_polyfill___promise_polyfill_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.2.0.tgz"; + sha1 = "367394726da7561457aba2133c9ceefbd6267da0"; }; } { @@ -9498,11 +9538,11 @@ }; } { - name = "prompts___prompts_2.3.2.tgz"; + name = "prompts___prompts_2.4.0.tgz"; path = fetchurl { - name = "prompts___prompts_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz"; - sha1 = "480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"; + name = "prompts___prompts_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz"; + sha1 = "4aa5de0723a231d1ee9121c40fdf663df73f61d7"; }; } { @@ -9746,19 +9786,19 @@ }; } { - name = "react_dom___react_dom_16.13.1.tgz"; + name = "react_dom___react_dom_16.14.0.tgz"; path = fetchurl { - name = "react_dom___react_dom_16.13.1.tgz"; - url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz"; - sha1 = "c1bd37331a0486c078ee54c4740720993b2e0e7f"; + name = "react_dom___react_dom_16.14.0.tgz"; + url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz"; + sha1 = "7ad838ec29a777fb3c75c3a190f661cf92ab8b89"; }; } { - name = "react_error_overlay___react_error_overlay_6.0.7.tgz"; + name = "react_error_overlay___react_error_overlay_6.0.8.tgz"; path = fetchurl { - name = "react_error_overlay___react_error_overlay_6.0.7.tgz"; - url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.7.tgz"; - sha1 = "1dcfb459ab671d53f660a991513cb2f0a0553108"; + name = "react_error_overlay___react_error_overlay_6.0.8.tgz"; + url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.8.tgz"; + sha1 = "474ed11d04fc6bda3af643447d85e9127ed6b5de"; }; } { @@ -9770,6 +9810,14 @@ }; } { + name = "react_is___react_is_17.0.1.tgz"; + path = fetchurl { + name = "react_is___react_is_17.0.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz"; + sha1 = "5b3531bd76a645a4c9fb6e693ed36419e3301339"; + }; + } + { name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz"; path = fetchurl { name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz"; @@ -9802,11 +9850,11 @@ }; } { - name = "react_test_renderer___react_test_renderer_16.13.1.tgz"; + name = "react_test_renderer___react_test_renderer_16.14.0.tgz"; path = fetchurl { - name = "react_test_renderer___react_test_renderer_16.13.1.tgz"; - url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.1.tgz"; - sha1 = "de25ea358d9012606de51e012d9742e7f0deabc1"; + name = "react_test_renderer___react_test_renderer_16.14.0.tgz"; + url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.14.0.tgz"; + sha1 = "e98360087348e260c56d4fe2315e970480c228ae"; }; } { @@ -9818,19 +9866,19 @@ }; } { - name = "react___react_16.13.1.tgz"; + name = "react___react_16.14.0.tgz"; path = fetchurl { - name = "react___react_16.13.1.tgz"; - url = "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz"; - sha1 = "2e818822f1a9743122c063d6410d85c1e3afe48e"; + name = "react___react_16.14.0.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz"; + sha1 = "94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"; }; } { - name = "reactstrap___reactstrap_8.6.0.tgz"; + name = "reactstrap___reactstrap_8.7.1.tgz"; path = fetchurl { - name = "reactstrap___reactstrap_8.6.0.tgz"; - url = "https://registry.yarnpkg.com/reactstrap/-/reactstrap-8.6.0.tgz"; - sha1 = "baee0d12990c9fef3c82199fb05e84d9f0af1a26"; + name = "reactstrap___reactstrap_8.7.1.tgz"; + url = "https://registry.yarnpkg.com/reactstrap/-/reactstrap-8.7.1.tgz"; + sha1 = "9631db8460a83a4d40fbee61abdd577b4f1a7069"; }; } { @@ -9890,11 +9938,11 @@ }; } { - name = "readdirp___readdirp_3.4.0.tgz"; + name = "readdirp___readdirp_3.5.0.tgz"; path = fetchurl { - name = "readdirp___readdirp_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz"; - sha1 = "9fdccdf9e9155805449221ac645e8303ab5b9ada"; + name = "readdirp___readdirp_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz"; + sha1 = "9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"; }; } { @@ -9930,11 +9978,11 @@ }; } { - name = "regenerate___regenerate_1.4.1.tgz"; + name = "regenerate___regenerate_1.4.2.tgz"; path = fetchurl { - name = "regenerate___regenerate_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz"; - sha1 = "cad92ad8e6b591773485fbe05a485caf4f457e6f"; + name = "regenerate___regenerate_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz"; + sha1 = "b9346d8827e8f5a32f7ba29637d398b69014848a"; }; } { @@ -10042,11 +10090,11 @@ }; } { - name = "renderkid___renderkid_2.0.3.tgz"; + name = "renderkid___renderkid_2.0.4.tgz"; path = fetchurl { - name = "renderkid___renderkid_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.3.tgz"; - sha1 = "380179c2ff5ae1365c522bf2fcfcff01c5b74149"; + name = "renderkid___renderkid_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.4.tgz"; + sha1 = "d325e532afb28d3f8796ffee306be8ffd6fc864c"; }; } { @@ -10178,11 +10226,11 @@ }; } { - name = "resolve___resolve_1.17.0.tgz"; + name = "resolve___resolve_1.19.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.17.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz"; - sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444"; + name = "resolve___resolve_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz"; + sha1 = "1af5bf630409734a067cae29318aac7fa29a267c"; }; } { @@ -10634,11 +10682,11 @@ }; } { - name = "sinon___sinon_9.2.0.tgz"; + name = "sinon___sinon_9.2.1.tgz"; path = fetchurl { - name = "sinon___sinon_9.2.0.tgz"; - url = "https://registry.yarnpkg.com/sinon/-/sinon-9.2.0.tgz"; - sha1 = "1d333967e30023609f7347351ebc0dc964c0f3c9"; + name = "sinon___sinon_9.2.1.tgz"; + url = "https://registry.yarnpkg.com/sinon/-/sinon-9.2.1.tgz"; + sha1 = "64cc88beac718557055bd8caa526b34a2231be6d"; }; } { @@ -10874,11 +10922,11 @@ }; } { - name = "stack_utils___stack_utils_1.0.2.tgz"; + name = "stack_utils___stack_utils_1.0.3.tgz"; path = fetchurl { - name = "stack_utils___stack_utils_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz"; - sha1 = "33eba3897788558bebfc2db059dc158ec36cebb8"; + name = "stack_utils___stack_utils_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.3.tgz"; + sha1 = "db7a475733b5b8bf6521907b18891d29006f7751"; }; } { @@ -10994,19 +11042,19 @@ }; } { - name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; + name = "string.prototype.trimend___string.prototype.trimend_1.0.2.tgz"; path = fetchurl { - name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; - sha1 = "85812a6b847ac002270f5808146064c995fb6913"; + name = "string.prototype.trimend___string.prototype.trimend_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz"; + sha1 = "6ddd9a8796bc714b489a3ae22246a208f37bfa46"; }; } { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.2.tgz"; path = fetchurl { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; - sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"; + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz"; + sha1 = "22d45da81015309cd0cdd79787e8919fc5c613e7"; }; } { @@ -11274,11 +11322,11 @@ }; } { - name = "timers_browserify___timers_browserify_2.0.11.tgz"; + name = "timers_browserify___timers_browserify_2.0.12.tgz"; path = fetchurl { - name = "timers_browserify___timers_browserify_2.0.11.tgz"; - url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz"; - sha1 = "800b1f3eee272e5bc53ee465a04d0e804c31211f"; + name = "timers_browserify___timers_browserify_2.0.12.tgz"; + url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz"; + sha1 = "44a45c11fbf407f34f97bccd1577c652361b00ee"; }; } { @@ -11426,11 +11474,11 @@ }; } { - name = "tslib___tslib_1.14.0.tgz"; + name = "tslib___tslib_1.14.1.tgz"; path = fetchurl { - name = "tslib___tslib_1.14.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.0.tgz"; - sha1 = "d624983f3e2c5e0b55307c3dd6c86acd737622c6"; + name = "tslib___tslib_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; + sha1 = "cf2d38bdc34a134bcaf1091c41f6619e2f672d00"; }; } { @@ -11770,11 +11818,11 @@ }; } { - name = "v8_compile_cache___v8_compile_cache_2.1.1.tgz"; + name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz"; - sha1 = "54bc3cdd43317bca91e35dcaf305b1a7237de745"; + name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; + sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"; }; } { @@ -11858,19 +11906,19 @@ }; } { - name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.1.tgz"; path = fetchurl { - name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz"; - sha1 = "9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"; + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz"; + sha1 = "38500072ee6ece66f3769936950ea1771be1c957"; }; } { - name = "watchpack___watchpack_1.7.4.tgz"; + name = "watchpack___watchpack_1.7.5.tgz"; path = fetchurl { - name = "watchpack___watchpack_1.7.4.tgz"; - url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz"; - sha1 = "6e9da53b3c80bb2d6508188f5b200410866cd30b"; + name = "watchpack___watchpack_1.7.5.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz"; + sha1 = "1267e6c55e0b9b5be44c2023aed5437a2c26c453"; }; } { @@ -11986,11 +12034,11 @@ }; } { - name = "whatwg_fetch___whatwg_fetch_3.4.1.tgz"; + name = "whatwg_fetch___whatwg_fetch_3.5.0.tgz"; path = fetchurl { - name = "whatwg_fetch___whatwg_fetch_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz"; - sha1 = "e5f871572d6879663fa5674c8f833f15a8425ab3"; + name = "whatwg_fetch___whatwg_fetch_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz"; + sha1 = "605a2cd0a7146e5db141e29d1c62ab84c0c4c868"; }; } { @@ -12018,11 +12066,11 @@ }; } { - name = "whatwg_url___whatwg_url_8.3.0.tgz"; + name = "whatwg_url___whatwg_url_8.4.0.tgz"; path = fetchurl { - name = "whatwg_url___whatwg_url_8.3.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.3.0.tgz"; - sha1 = "d1e11e565334486cdb280d3101b9c3fd1c867582"; + name = "whatwg_url___whatwg_url_8.4.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz"; + sha1 = "50fb9615b05469591d2b2bd6dfaed2942ed72837"; }; } { @@ -12250,11 +12298,11 @@ }; } { - name = "ws___ws_7.3.1.tgz"; + name = "ws___ws_7.4.0.tgz"; path = fetchurl { - name = "ws___ws_7.3.1.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz"; - sha1 = "d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"; + name = "ws___ws_7.4.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz"; + sha1 = "a5dd76a24197940d4a8bb9e0e152bb4503764da7"; }; } { @@ -12274,11 +12322,11 @@ }; } { - name = "xregexp___xregexp_4.3.0.tgz"; + name = "xregexp___xregexp_4.4.0.tgz"; path = fetchurl { - name = "xregexp___xregexp_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz"; - sha1 = "7e92e73d9174a99a59743f67a4ce879a04b5ae50"; + name = "xregexp___xregexp_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.4.0.tgz"; + sha1 = "29660f5d6567cd2ef981dd4a50cb05d22c10719d"; }; } { diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 918c0419e0087..8d4b52a015932 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -58,7 +58,7 @@ in { }; nextcloud20 = generic { - version = "20.0.3"; - sha256 = "sha256-4PZFBNM49k08Z3NX8AEs+LDtDcQuwI+Vi23E/3Dt8XU="; + version = "20.0.4"; + sha256 = "sha256-Jp8WIuMm9dEeOH04YarU4rDnkzSul+7Vp7M1K6dmFCA="; }; } diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index adbcbb63759b8..7ec56b023e591 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "1w48rqrbqah0hnirvjdz8lyr9ah8b73j3cgsppb04gnrmpssgmb6"; + sha256 = "1qi617ppjjl38mqpbxiqhpxanq9qgqshb87cajs30rqkv9nj811k"; }; patches = [ ./sysstatedir.patch ]; diff --git a/pkgs/servers/nfs-ganesha/sysstatedir.patch b/pkgs/servers/nfs-ganesha/sysstatedir.patch index 534f71743e717..fff3d58973533 100644 --- a/pkgs/servers/nfs-ganesha/sysstatedir.patch +++ b/pkgs/servers/nfs-ganesha/sysstatedir.patch @@ -1,15 +1,22 @@ diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake -index 51697310b..2b5f91075 100644 +index 2a5795e9f..7314e0594 100644 --- a/src/include/config-h.in.cmake +++ b/src/include/config-h.in.cmake -@@ -72,8 +72,8 @@ +@@ -71,13 +71,13 @@ + #cmakedefine HAVE_URCU_REF_GET_UNLESS_ZERO 1 #define NFS_GANESHA 1 - #define GANESHA_CONFIG_PATH "@SYSCONFDIR@/ganesha/ganesha.conf" +-#define GANESHA_CONFIG_PATH "@SYSCONFDIR@/ganesha/ganesha.conf" -#define GANESHA_PIDFILE_PATH "@SYSSTATEDIR@/run/ganesha.pid" -#define NFS_V4_RECOV_ROOT "@SYSSTATEDIR@/lib/nfs/ganesha" ++#define GANESHA_CONFIG_PATH "/etc/ganesha/ganesha.conf" +#define GANESHA_PIDFILE_PATH "/run/ganesha.pid" +#define NFS_V4_RECOV_ROOT "/var/lib/nfs/ganesha" /** * @brief Default value for krb5_param.ccache_dir */ +-#define DEFAULT_NFS_CCACHE_DIR "@SYSSTATEDIR@/run/ganesha" ++#define DEFAULT_NFS_CCACHE_DIR "/run/ganesha" + + /* We're LGPL'd */ + #define _LGPL_SOURCE 1 diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index e27048b27235f..9e60e9f37044d 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.21.0.3711-b509cc236"; + version = "1.21.1.3795-ee64ab56f"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0nhxxfcds3byhbz8gsd9107diy182m33xbcc8jgi78hwfadyjj7h"; + sha256 = "1k4ayb5jygi9g78703r1z4y4m0mp66m6jc72zj4zqk4xckzvjf4f"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0izsmcc337paakz1nqfsr78s097sxyxy3kbs43qpzpx7w5wshynb"; + sha256 = "0qfc5k9sgi465pgrhv8nbm5p7s4wdpaljj54m2i7hfydva8ws8ci"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 98ce4f25a2e45..05604e936c7f7 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.4.9"; + version = "1.4.10"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "1cpcr3abjq1f2af0ca571y976yni48z3rh3x146c6ninl5ip9b4z"; + sha256 = "03sjvmnrspkiq0w73xvp1w61pcxhv0djrdm3mvs8h0dp9pfc1n53"; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/pkgs/servers/samba/0001-lib-util-Standardize-use-of-st_-acm-time-ns.patch b/pkgs/servers/samba/0001-lib-util-Standardize-use-of-st_-acm-time-ns.patch new file mode 100644 index 0000000000000..6de704cba2852 --- /dev/null +++ b/pkgs/servers/samba/0001-lib-util-Standardize-use-of-st_-acm-time-ns.patch @@ -0,0 +1,569 @@ +From 55a5b9c8254126d0acef8702526c92a31200a07c Mon Sep 17 00:00:00 2001 +From: Matthew DeVore <matvore@google.com> +Date: Tue, 4 Aug 2020 17:49:42 -0700 +Subject: [PATCH] lib/util: Standardize use of st_[acm]time ns + +Commit 810397f89a10, and possibly others, broke the build for macOS and +other environments which don't have st_[acm]tim fields on 'struct stat'. + +Multiple places in the codebase used the config.h values to determine +how to access the nanosecond or microsecond values of the stat +timestamps, so rather than add more, centralize them all into +lib/util/time.c. + +Also allow pvfs_fileinfo.c to read nanosecond-granularity timestamps on +platforms where it didn't before, since its #if branches were not +complete. + +Signed-off-by: Matthew DeVore <matvore@google.com> +Reviewed-by: Jeremy Allison <jra@samba.org> +Reviewed-by: Volker Lendecke <vl@samba.org> + +Autobuild-User(master): Volker Lendecke <vl@samba.org> +Autobuild-Date(master): Sat Aug 15 08:51:09 UTC 2020 on sn-devel-184 +--- + lib/replace/wscript | 2 - + lib/util/time.c | 230 ++++++++++++++++++++ + lib/util/time.h | 18 ++ + source3/lib/system.c | 121 +--------- + source3/libsmb/libsmb_stat.c | 24 +- + source4/ntvfs/posix/pvfs_fileinfo.c | 11 +- + source4/torture/libsmbclient/libsmbclient.c | 7 +- + 7 files changed, 277 insertions(+), 136 deletions(-) + +diff --git a/lib/replace/wscript b/lib/replace/wscript +index 64f305d6df0..85bc11d2f01 100644 +--- a/lib/replace/wscript ++++ b/lib/replace/wscript +@@ -746,8 +746,6 @@ def configure(conf): + + conf.CHECK_CODE('mkdir("foo",0777)', define='HAVE_MKDIR_MODE', headers='sys/stat.h') + +- conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtim.tv_nsec', define='HAVE_STAT_TV_NSEC', +- headers='sys/stat.h') + # we need the st_rdev test under two names + conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_rdev', + define='HAVE_STRUCT_STAT_ST_RDEV', +diff --git a/lib/util/time.c b/lib/util/time.c +index 0fac5e2e397..b5c1d700b23 100644 +--- a/lib/util/time.c ++++ b/lib/util/time.c +@@ -26,6 +26,10 @@ + #include "byteorder.h" + #include "time_basic.h" + #include "lib/util/time.h" /* Avoid /usr/include/time.h */ ++#include <sys/stat.h> ++#ifndef NO_CONFIG_H ++#include "config.h" ++#endif + + /** + * @file +@@ -1232,3 +1236,229 @@ struct timespec time_t_to_full_timespec(time_t t) + } + return (struct timespec){.tv_sec = t}; + } ++ ++#if !defined(HAVE_STAT_HIRES_TIMESTAMPS) ++ ++/* Old system - no ns timestamp. */ ++time_t get_atimensec(const struct stat *st) ++{ ++ return 0; ++} ++ ++time_t get_mtimensec(const struct stat *st) ++{ ++ return 0; ++} ++ ++time_t get_ctimensec(const struct stat *st) ++{ ++ return 0; ++} ++ ++/* Set does nothing with no ns timestamp. */ ++void set_atimensec(struct stat *st, time_t ns) ++{ ++ return; ++} ++ ++void set_mtimensec(struct stat *st, time_t ns) ++{ ++ return; ++} ++ ++void set_ctimensec(struct stat *st, time_t ns) ++{ ++ return; ++} ++ ++#elif HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC ++ ++time_t get_atimensec(const struct stat *st) ++{ ++ return st->st_atimespec.tv_nsec; ++} ++ ++time_t get_mtimensec(const struct stat *st) ++{ ++ return st->st_mtimespec.tv_nsec; ++} ++ ++time_t get_ctimensec(const struct stat *st) ++{ ++ return st->st_ctimespec.tv_nsec; ++} ++ ++void set_atimensec(struct stat *st, time_t ns) ++{ ++ st->st_atimespec.tv_nsec = ns; ++} ++ ++void set_mtimensec(struct stat *st, time_t ns) ++{ ++ st->st_mtimespec.tv_nsec = ns; ++} ++ ++void set_ctimensec(struct stat *st, time_t ns) ++{ ++ st->st_ctimespec.tv_nsec = ns; ++} ++ ++#elif HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC ++ ++time_t get_atimensec(const struct stat *st) ++{ ++ return st->st_atim.tv_nsec; ++} ++ ++time_t get_mtimensec(const struct stat *st) ++{ ++ return st->st_mtim.tv_nsec; ++} ++ ++time_t get_ctimensec(const struct stat *st) ++{ ++ return st->st_ctim.tv_nsec; ++} ++ ++void set_atimensec(struct stat *st, time_t ns) ++{ ++ st->st_atim.tv_nsec = ns; ++} ++ ++void set_mtimensec(struct stat *st, time_t ns) ++{ ++ st->st_mtim.tv_nsec = ns; ++} ++void set_ctimensec(struct stat *st, time_t ns) ++{ ++ st->st_ctim.tv_nsec = ns; ++} ++ ++#elif HAVE_STRUCT_STAT_ST_MTIMENSEC ++ ++time_t get_atimensec(const struct stat *st) ++{ ++ return st->st_atimensec; ++} ++ ++time_t get_mtimensec(const struct stat *st) ++{ ++ return st->st_mtimensec; ++} ++ ++time_t get_ctimensec(const struct stat *st) ++{ ++ return st->st_ctimensec; ++} ++ ++void set_atimensec(struct stat *st, time_t ns) ++{ ++ st->st_atimensec = ns; ++} ++ ++void set_mtimensec(struct stat *st, time_t ns) ++{ ++ st->st_mtimensec = ns; ++} ++ ++void set_ctimensec(struct stat *st, time_t ns) ++{ ++ st->st_ctimensec = ns; ++} ++ ++#elif HAVE_STRUCT_STAT_ST_MTIME_N ++ ++time_t get_atimensec(const struct stat *st) ++{ ++ return st->st_atime_n; ++} ++ ++time_t get_mtimensec(const struct stat *st) ++{ ++ return st->st_mtime_n; ++} ++ ++time_t get_ctimensec(const struct stat *st) ++{ ++ return st->st_ctime_n; ++} ++ ++void set_atimensec(struct stat *st, time_t ns) ++{ ++ st->st_atime_n = ns; ++} ++ ++void set_mtimensec(struct stat *st, time_t ns) ++{ ++ st->st_mtime_n = ns; ++} ++ ++void set_ctimensec(struct stat *st, time_t ns) ++{ ++ st->st_ctime_n = ns; ++} ++ ++#elif HAVE_STRUCT_STAT_ST_UMTIME ++ ++/* Only usec timestamps available. Convert to/from nsec. */ ++ ++time_t get_atimensec(const struct stat *st) ++{ ++ return st->st_uatime * 1000; ++} ++ ++time_t get_mtimensec(const struct stat *st) ++{ ++ return st->st_umtime * 1000; ++} ++ ++time_t get_ctimensec(const struct stat *st) ++{ ++ return st->st_uctime * 1000; ++} ++ ++void set_atimensec(struct stat *st, time_t ns) ++{ ++ st->st_uatime = ns / 1000; ++} ++ ++void set_mtimensec(struct stat *st, time_t ns) ++{ ++ st->st_umtime = ns / 1000; ++} ++ ++void set_ctimensec(struct stat *st, time_t ns) ++{ ++ st->st_uctime = ns / 1000; ++} ++ ++#else ++#error CONFIGURE_ERROR_IN_DETECTING_TIMESPEC_IN_STAT ++#endif ++ ++struct timespec get_atimespec(const struct stat *pst) ++{ ++ struct timespec ret; ++ ++ ret.tv_sec = pst->st_atime; ++ ret.tv_nsec = get_atimensec(pst); ++ return ret; ++} ++ ++struct timespec get_mtimespec(const struct stat *pst) ++{ ++ struct timespec ret; ++ ++ ret.tv_sec = pst->st_mtime; ++ ret.tv_nsec = get_mtimensec(pst); ++ return ret; ++} ++ ++struct timespec get_ctimespec(const struct stat *pst) ++{ ++ struct timespec ret; ++ ++ ret.tv_sec = pst->st_mtime; ++ ret.tv_nsec = get_ctimensec(pst); ++ return ret; ++} +diff --git a/lib/util/time.h b/lib/util/time.h +index 4a90b40d5ce..04945b5f25f 100644 +--- a/lib/util/time.h ++++ b/lib/util/time.h +@@ -375,4 +375,22 @@ time_t full_timespec_to_time_t(const struct timespec *ts); + time_t nt_time_to_full_time_t(NTTIME nt); + struct timespec time_t_to_full_timespec(time_t t); + ++/* ++ * Functions to get and set the number of nanoseconds for times in a stat field. ++ * If the stat has timestamp granularity less than nanosecond, then the set_* ++ * operations will be lossy. ++ */ ++struct stat; ++time_t get_atimensec(const struct stat *); ++time_t get_mtimensec(const struct stat *); ++time_t get_ctimensec(const struct stat *); ++void set_atimensec(struct stat *, time_t); ++void set_mtimensec(struct stat *, time_t); ++void set_ctimensec(struct stat *, time_t); ++ ++/* These are convenience wrappers for the above getters. */ ++struct timespec get_atimespec(const struct stat *); ++struct timespec get_mtimespec(const struct stat *); ++struct timespec get_ctimespec(const struct stat *); ++ + #endif /* _SAMBA_TIME_H_ */ +diff --git a/source3/lib/system.c b/source3/lib/system.c +index f1265e0c43f..7c8cd19d11f 100644 +--- a/source3/lib/system.c ++++ b/source3/lib/system.c +@@ -25,7 +25,8 @@ + #include "system/capability.h" + #include "system/passwd.h" + #include "system/filesys.h" +-#include "../lib/util/setid.h" ++#include "lib/util/setid.h" ++#include "lib/util/time.h" + + #ifdef HAVE_SYS_SYSCTL_H + #include <sys/sysctl.h> +@@ -122,124 +123,6 @@ int sys_fcntl_int(int fd, int cmd, int arg) + return ret; + } + +-/**************************************************************************** +- Get/Set all the possible time fields from a stat struct as a timespec. +-****************************************************************************/ +- +-static struct timespec get_atimespec(const struct stat *pst) +-{ +-#if !defined(HAVE_STAT_HIRES_TIMESTAMPS) +- struct timespec ret; +- +- /* Old system - no ns timestamp. */ +- ret.tv_sec = pst->st_atime; +- ret.tv_nsec = 0; +- return ret; +-#else +-#if defined(HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC) +- struct timespec ret; +- ret.tv_sec = pst->st_atim.tv_sec; +- ret.tv_nsec = pst->st_atim.tv_nsec; +- return ret; +-#elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC) +- struct timespec ret; +- ret.tv_sec = pst->st_atime; +- ret.tv_nsec = pst->st_atimensec; +- return ret; +-#elif defined(HAVE_STRUCT_STAT_ST_MTIME_N) +- struct timespec ret; +- ret.tv_sec = pst->st_atime; +- ret.tv_nsec = pst->st_atime_n; +- return ret; +-#elif defined(HAVE_STRUCT_STAT_ST_UMTIME) +- struct timespec ret; +- ret.tv_sec = pst->st_atime; +- ret.tv_nsec = pst->st_uatime * 1000; +- return ret; +-#elif defined(HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC) +- return pst->st_atimespec; +-#else +-#error CONFIGURE_ERROR_IN_DETECTING_TIMESPEC_IN_STAT +-#endif +-#endif +-} +- +-static struct timespec get_mtimespec(const struct stat *pst) +-{ +-#if !defined(HAVE_STAT_HIRES_TIMESTAMPS) +- struct timespec ret; +- +- /* Old system - no ns timestamp. */ +- ret.tv_sec = pst->st_mtime; +- ret.tv_nsec = 0; +- return ret; +-#else +-#if defined(HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC) +- struct timespec ret; +- ret.tv_sec = pst->st_mtim.tv_sec; +- ret.tv_nsec = pst->st_mtim.tv_nsec; +- return ret; +-#elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC) +- struct timespec ret; +- ret.tv_sec = pst->st_mtime; +- ret.tv_nsec = pst->st_mtimensec; +- return ret; +-#elif defined(HAVE_STRUCT_STAT_ST_MTIME_N) +- struct timespec ret; +- ret.tv_sec = pst->st_mtime; +- ret.tv_nsec = pst->st_mtime_n; +- return ret; +-#elif defined(HAVE_STRUCT_STAT_ST_UMTIME) +- struct timespec ret; +- ret.tv_sec = pst->st_mtime; +- ret.tv_nsec = pst->st_umtime * 1000; +- return ret; +-#elif defined(HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC) +- return pst->st_mtimespec; +-#else +-#error CONFIGURE_ERROR_IN_DETECTING_TIMESPEC_IN_STAT +-#endif +-#endif +-} +- +-static struct timespec get_ctimespec(const struct stat *pst) +-{ +-#if !defined(HAVE_STAT_HIRES_TIMESTAMPS) +- struct timespec ret; +- +- /* Old system - no ns timestamp. */ +- ret.tv_sec = pst->st_ctime; +- ret.tv_nsec = 0; +- return ret; +-#else +-#if defined(HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC) +- struct timespec ret; +- ret.tv_sec = pst->st_ctim.tv_sec; +- ret.tv_nsec = pst->st_ctim.tv_nsec; +- return ret; +-#elif defined(HAVE_STRUCT_STAT_ST_MTIMENSEC) +- struct timespec ret; +- ret.tv_sec = pst->st_ctime; +- ret.tv_nsec = pst->st_ctimensec; +- return ret; +-#elif defined(HAVE_STRUCT_STAT_ST_MTIME_N) +- struct timespec ret; +- ret.tv_sec = pst->st_ctime; +- ret.tv_nsec = pst->st_ctime_n; +- return ret; +-#elif defined(HAVE_STRUCT_STAT_ST_UMTIME) +- struct timespec ret; +- ret.tv_sec = pst->st_ctime; +- ret.tv_nsec = pst->st_uctime * 1000; +- return ret; +-#elif defined(HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC) +- return pst->st_ctimespec; +-#else +-#error CONFIGURE_ERROR_IN_DETECTING_TIMESPEC_IN_STAT +-#endif +-#endif +-} +- + /**************************************************************************** + Return the best approximation to a 'create time' under UNIX from a stat + structure. +diff --git a/source3/libsmb/libsmb_stat.c b/source3/libsmb/libsmb_stat.c +index 790934bd565..b01aeb51ac1 100644 +--- a/source3/libsmb/libsmb_stat.c ++++ b/source3/libsmb/libsmb_stat.c +@@ -27,6 +27,7 @@ + #include "libsmbclient.h" + #include "libsmb_internal.h" + #include "../libcli/smb/smbXcli_base.h" ++#include "lib/util/time.h" + + /* + * Generate an inode number from file name for those things that need it +@@ -102,18 +103,29 @@ void setup_stat(struct stat *st, + } + + st->st_dev = dev; +- st->st_atim = access_time_ts; +- st->st_ctim = change_time_ts; +- st->st_mtim = write_time_ts; ++ ++ st->st_atime = access_time_ts.tv_sec; ++ set_atimensec(st, access_time_ts.tv_nsec); ++ ++ st->st_ctime = change_time_ts.tv_sec; ++ set_ctimensec(st, change_time_ts.tv_nsec); ++ ++ st->st_mtime = write_time_ts.tv_sec; ++ set_mtimensec(st, write_time_ts.tv_nsec); + } + + void setup_stat_from_stat_ex(const struct stat_ex *stex, + const char *fname, + struct stat *st) + { +- st->st_atim = stex->st_ex_atime; +- st->st_ctim = stex->st_ex_ctime; +- st->st_mtim = stex->st_ex_mtime; ++ st->st_atime = stex->st_ex_atime.tv_sec; ++ set_atimensec(st, stex->st_ex_atime.tv_nsec); ++ ++ st->st_ctime = stex->st_ex_ctime.tv_sec; ++ set_ctimensec(st, stex->st_ex_ctime.tv_nsec); ++ ++ st->st_mtime = stex->st_ex_mtime.tv_sec; ++ set_mtimensec(st, stex->st_ex_mtime.tv_nsec); + + st->st_mode = stex->st_ex_mode; + st->st_size = stex->st_ex_size; +diff --git a/source4/ntvfs/posix/pvfs_fileinfo.c b/source4/ntvfs/posix/pvfs_fileinfo.c +index d2e2aeea265..977ea4fa3d5 100644 +--- a/source4/ntvfs/posix/pvfs_fileinfo.c ++++ b/source4/ntvfs/posix/pvfs_fileinfo.c +@@ -21,6 +21,7 @@ + + #include "includes.h" + #include "vfs_posix.h" ++#include "lib/util/time.h" + + /**************************************************************************** + Change a unix mode to a dos mode. +@@ -72,12 +73,10 @@ NTSTATUS pvfs_fill_dos_info(struct pvfs_state *pvfs, struct pvfs_filename *name, + unix_to_nt_time(&name->dos.access_time, name->st.st_atime); + unix_to_nt_time(&name->dos.write_time, name->st.st_mtime); + unix_to_nt_time(&name->dos.change_time, name->st.st_ctime); +-#ifdef HAVE_STAT_TV_NSEC +- name->dos.create_time += name->st.st_ctim.tv_nsec / 100; +- name->dos.access_time += name->st.st_atim.tv_nsec / 100; +- name->dos.write_time += name->st.st_mtim.tv_nsec / 100; +- name->dos.change_time += name->st.st_ctim.tv_nsec / 100; +-#endif ++ name->dos.create_time += get_ctimensec(&name->st) / 100; ++ name->dos.access_time += get_atimensec(&name->st) / 100; ++ name->dos.write_time += get_mtimensec(&name->st) / 100; ++ name->dos.change_time += get_ctimensec(&name->st) / 100; + name->dos.attrib = dos_mode_from_stat(pvfs, &name->st); + name->dos.alloc_size = pvfs_round_alloc_size(pvfs, name->st.st_size); + name->dos.nlink = name->st.st_nlink; +diff --git a/source4/torture/libsmbclient/libsmbclient.c b/source4/torture/libsmbclient/libsmbclient.c +index 3f3992593f9..4fbd759487b 100644 +--- a/source4/torture/libsmbclient/libsmbclient.c ++++ b/source4/torture/libsmbclient/libsmbclient.c +@@ -27,6 +27,7 @@ + #include "lib/param/loadparm.h" + #include "lib/param/param_global.h" + #include "dynconfig.h" ++#include "lib/util/time.h" + + /* test string to compare with when debug_callback is called */ + #define TEST_STRING "smbc_setLogCallback test" +@@ -1231,8 +1232,8 @@ static bool torture_libsmbclient_utimes(struct torture_context *tctx) + ret = smbc_fstat(fhandle, &st); + torture_assert_int_not_equal(tctx, ret, -1, "smbc_fstat failed"); + +- tbuf[0] = convert_timespec_to_timeval(st.st_atim); +- tbuf[1] = convert_timespec_to_timeval(st.st_mtim); ++ tbuf[0] = convert_timespec_to_timeval(get_atimespec(&st)); ++ tbuf[1] = convert_timespec_to_timeval(get_mtimespec(&st)); + + tbuf[1] = timeval_add(&tbuf[1], 0, 100000); /* 100 msec */ + +@@ -1244,7 +1245,7 @@ static bool torture_libsmbclient_utimes(struct torture_context *tctx) + + torture_assert_int_equal( + tctx, +- st.st_mtim.tv_nsec / 1000, ++ get_mtimensec(&st) / 1000, + tbuf[1].tv_usec, + "smbc_utimes did not update msec"); + +-- +2.29.2 + diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index ec28834659aae..164604242d867 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -12,6 +12,7 @@ , docbook_xml_dtd_45 , readline , popt +, dbus , libbsd , libarchive , zlib @@ -43,11 +44,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.12.6"; + version = "4.13.3"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "1v3cmw40csmi3jd8mhlx4bm7bk4m0426zkyin7kq11skwnsrna02"; + sha256 = "0hb5fli4kgwg376c289mcmdqszd51vs8pzzrw7j6yr9k7za8a1f1"; }; outputs = [ "out" "dev" "man" ]; @@ -57,6 +58,8 @@ stdenv.mkDerivation rec { ./patch-source3__libads__kerberos_keytab.c.patch ./4.x-no-persistent-install-dynconfig.patch ./4.x-fix-makeflags-parsing.patch + # Backport, should be removed for version 4.14 + ./0001-lib-util-Standardize-use-of-st_-acm-time-ns.patch ]; nativeBuildInputs = [ @@ -79,6 +82,7 @@ stdenv.mkDerivation rec { python readline popt + dbus jansson libbsd libarchive @@ -154,6 +158,7 @@ stdenv.mkDerivation rec { description = "The standard Windows interoperability suite of programs for Linux and Unix"; license = licenses.gpl3; platforms = platforms.unix; + broken = stdenv.isDarwin; maintainers = with maintainers; [ aneeshusa ]; }; } diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 0d6176d85971a..fdf4b40d3b068 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.0.3"; + version = "3.1.0"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "05s8cx1rlysiq7dd44kf7cid0la61a4p895j9g95bvfb8v8dpzh7"; + sha256 = "008280ijd6m9h35y9lcpql0fk0h9f3zkc1pfkdm0rkbnd12y41ns"; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index a6841f7fabedc..b89abfc6153bc 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { propagatedBuildInputs = [ trezor-udev-rules ]; meta = with stdenv.lib; { - description = "TREZOR Communication Daemon aka TREZOR Bridge"; + description = "Trezor Communication Daemon aka Trezor Bridge"; homepage = "https://trezor.io"; license = licenses.lgpl3; maintainers = with maintainers; [ canndrew jb55 prusnak mmahut _1000101 ]; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 3072b44e4a30e..b354fd994c97f 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -38,23 +38,21 @@ let }; }; -in { - - # https://community.ui.com/releases / https://www.ui.com/download/unifi - # Outdated FAQ: https://help.ubnt.com/hc/en-us/articles/115000441548-UniFi-Current-Controller-Versions +in rec { + # see https://community.ui.com/releases / https://www.ui.com/download/unifi unifiLTS = generic { version = "5.6.42"; sha256 = "0wxkv774pw43c15jk0sg534l5za4j067nr85r5fw58iar3w2l84x"; }; - unifiStable = generic { + unifi5 = generic { version = "5.14.23"; sha256 = "1aar05yjm3z5a30x505w4kakbyz35i7mk7xyg0wm4ml6h94d84pv"; }; - unifiBeta = generic { - version = "6.0.36"; - sha256 = "1sjf4jd8jkf6194ahwqjxd2ip0r70bdk15gci1qrdw88agab143j"; + unifi6 = generic { + version = "6.0.43"; + sha256 = "1d9pw4f20pr4jb1xb43p7ycafv13ld1h40r05qg82029ml1s7jky"; }; } diff --git a/pkgs/servers/uwsgi/additional-php-ldflags.patch b/pkgs/servers/uwsgi/additional-php-ldflags.patch new file mode 100644 index 0000000000000..8549d5c2d03cf --- /dev/null +++ b/pkgs/servers/uwsgi/additional-php-ldflags.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/php/uwsgiplugin.py b/plugins/php/uwsgiplugin.py +index d930c44e..2fcbc22a 100644 +--- a/plugins/php/uwsgiplugin.py ++++ b/plugins/php/uwsgiplugin.py +@@ -17,6 +17,8 @@ php_version = os.popen(PHPPATH + ' --version').read().rstrip().split('.')[0] + CFLAGS = [os.popen(PHPPATH + ' --includes').read().rstrip(), '-Wno-sign-compare'] + LDFLAGS = os.popen(PHPPATH + ' --ldflags').read().rstrip().split() + ++LDFLAGS.append(os.environ.get('UWSGICONFIG_PHP_LDFLAGS', [])) ++ + if ld_run_path: + LDFLAGS.append('-L%s' % ld_run_path) + os.environ['LD_RUN_PATH'] = ld_run_path diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 39a3113eb410b..d9ed810cdf499 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, jansson, pcre +{ stdenv, nixosTests, lib, fetchurl, pkgconfig, jansson, pcre # plugins: list of strings, eg. [ "python2" "python3" ] , plugins ? [] , pam, withPAM ? stdenv.isLinux @@ -38,8 +38,12 @@ let php-embed = php.override { (lib.nameValuePair "php" { # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx path = "plugins/php"; - inputs = [ php-embed ] ++ php-embed.buildInputs; - NIX_CFLAGS_LINK = [ "-L${libmysqlclient}/lib/mysql" ]; + inputs = [ + php-embed + php-embed.extensions.session + php-embed.extensions.session.dev + php-embed.unwrapped.dev + ] ++ php-embed.unwrapped.buildInputs; }) ]; @@ -61,6 +65,11 @@ stdenv.mkDerivation rec { sha256 = "0256v72b7zr6ds4srpaawk1px3bp0djdwm239w3wrxpw7dzk1gjn"; }; + patches = [ + ./no-ext-session-php_session.h-on-NixOS.patch + ./additional-php-ldflags.patch + ]; + nativeBuildInputs = [ python3 pkgconfig ]; buildInputs = [ jansson pcre ] @@ -83,6 +92,16 @@ stdenv.mkDerivation rec { substituteAll ${./nixos.ini} buildconf/nixos.ini ''; + # this is a hack to make the php plugin link with session.so (which on nixos is a separate package) + # the hack works in coordination with ./additional-php-ldflags.patch + UWSGICONFIG_PHP_LDFLAGS = lib.optionalString (builtins.any (x: x.name == "php") needed) + (lib.concatStringsSep "," [ + "-Wl" + "-rpath=${php-embed.extensions.session}/lib/php/extensions/" + "--library-path=${php-embed.extensions.session}/lib/php/extensions/" + "-l:session.so" + ]); + buildPhase = '' mkdir -p $pluginDir python3 uwsgiconfig.py --build nixos @@ -94,8 +113,6 @@ stdenv.mkDerivation rec { ${lib.concatMapStringsSep "\n" (x: x.install or "") needed} ''; - NIX_CFLAGS_LINK = toString (lib.optional withSystemd "-lsystemd" ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed); - meta = with stdenv.lib; { homepage = "https://uwsgi-docs.readthedocs.org/en/latest/"; description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"; @@ -103,4 +120,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ abbradar schneefux globin ]; platforms = platforms.unix; }; + + passthru.tests.uwsgi = nixosTests.uwsgi; + } diff --git a/pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch b/pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch new file mode 100644 index 0000000000000..bde8f4fda1dc5 --- /dev/null +++ b/pkgs/servers/uwsgi/no-ext-session-php_session.h-on-NixOS.patch @@ -0,0 +1,29 @@ +From 6b9b3559d8ce59eda6c5cd6f04224cebaaa5d0ea Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=D0=94=D0=B0=D0=BC=D1=98=D0=B0=D0=BD=20=D0=93=D0=B5=D0=BE?= + =?UTF-8?q?=D1=80=D0=B3=D0=B8=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= + <gdamjan@gmail.com> +Date: Tue, 8 Sep 2020 17:11:39 +0200 +Subject: [PATCH] no ext/session/php_session.h on NixOS + +on NixOS php_session.h is in its own package, and is not installed in +ext/session/ +--- + plugins/php/common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/php/common.h b/plugins/php/common.h +index 9bf1c069..be93f519 100644 +--- a/plugins/php/common.h ++++ b/plugins/php/common.h +@@ -10,7 +10,7 @@ + #endif + #include "ext/standard/info.h" + +-#include "ext/session/php_session.h" ++#include "php_session.h" + + #include <uwsgi.h> + +-- +2.28.0 + diff --git a/pkgs/servers/web-apps/codimd/default.nix b/pkgs/servers/web-apps/hedgedoc/default.nix index 7de539bb09135..9fdaafbd24abc 100644 --- a/pkgs/servers/web-apps/codimd/default.nix +++ b/pkgs/servers/web-apps/hedgedoc/default.nix @@ -2,14 +2,14 @@ , which, nodejs, mkYarnPackage, python2, nixosTests }: mkYarnPackage rec { - name = "codimd"; - version = "1.6.0"; + name = "hedgedoc"; + version = "1.7.1"; src = fetchFromGitHub { - owner = "codimd"; - repo = "server"; + owner = "hedgedoc"; + repo = "hedgedoc"; rev = version; - sha256 = "1208a24v664ha9qzr7ky6i3ynphkaj0xi5l3rsw743i22nv5aj33"; + sha256 = "0axad5581v25pynfj6pgy0h1xp92dyllnc7mk42z6hxbs4sgkrw1"; }; nativeBuildInputs = [ which makeWrapper ]; @@ -20,19 +20,15 @@ mkYarnPackage rec { packageJSON = ./package.json; postConfigure = '' - rm deps/CodiMD/node_modules - cp -R "$node_modules" deps/CodiMD - chmod -R u+w deps/CodiMD + rm deps/HedgeDoc/node_modules + cp -R "$node_modules" deps/HedgeDoc + chmod -R u+w deps/HedgeDoc ''; buildPhase = '' runHook preBuild - cd deps/CodiMD - - pushd node_modules/codemirror - npm run install - popd + cd deps/HedgeDoc pushd node_modules/sqlite3 export CPPFLAGS="-I${nodejs}/include/node" @@ -52,23 +48,23 @@ mkYarnPackage rec { mkdir -p $out cp -R {app.js,bin,lib,locales,node_modules,package.json,public} $out - cat > $out/bin/codimd <<EOF + cat > $out/bin/hedgedoc <<EOF #!${stdenv.shell}/bin/sh ${nodejs}/bin/node $out/app.js EOF - chmod +x $out/bin/codimd - wrapProgram $out/bin/codimd \ + chmod +x $out/bin/hedgedoc + wrapProgram $out/bin/hedgedoc \ --set NODE_PATH "$out/lib/node_modules" runHook postDist ''; - passthru.tests = { inherit (nixosTests) codimd; }; + passthru.tests = { inherit (nixosTests) hedgedoc; }; meta = with stdenv.lib; { description = "Realtime collaborative markdown notes on all platforms"; license = licenses.agpl3; - homepage = "https://github.com/codimd/server"; + homepage = "https://hedgedoc.org"; maintainers = with maintainers; [ willibutz ma27 globin ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/web-apps/codimd/package.json b/pkgs/servers/web-apps/hedgedoc/package.json index 7f78d14ff3058..3e8046bbecdf5 100644 --- a/pkgs/servers/web-apps/codimd/package.json +++ b/pkgs/servers/web-apps/hedgedoc/package.json @@ -1,13 +1,14 @@ { - "name": "CodiMD", - "version": "1.6.0", - "description": "Realtime collaborative markdown notes on all platforms.", + "name": "HedgeDoc", + "version": "1.7.1", + "description": "The best platform to write and share markdown.", "main": "app.js", "license": "AGPL-3.0", "scripts": { "test": "npm run-script eslint && npm run-script jsonlint && npm run-script mocha-suite", "eslint": "node_modules/.bin/eslint --max-warnings 0 lib public test app.js", "jsonlint": "find . -not -path './node_modules/*' -type f -name '*.json' -o -type f -name '*.json.example' | while read json; do echo $json ; jq . $json; done", + "markdownlint": "remark .", "mocha-suite": "NODE_ENV=test CMD_DB_URL=\"sqlite::memory:\" mocha --exit", "standard": "echo 'standard is no longer being used, use `npm run eslint` instead!' && exit 1", "dev": "webpack --config webpack.dev.js --progress --colors --watch", @@ -18,9 +19,9 @@ "dependencies": { "@passport-next/passport-openid": "^1.0.0", "Idle.Js": "git+https://github.com/shawnmclean/Idle.js", - "archiver": "^2.1.1", + "archiver": "^5.0.2", "async": "^2.1.4", - "aws-sdk": "^2.345.0", + "aws-sdk": "^2.521.0", "azure-storage": "^2.7.0", "base64url": "^3.0.0", "body-parser": "^1.15.2", @@ -28,41 +29,42 @@ "bootstrap-validator": "^0.11.8", "chance": "^1.0.4", "cheerio": "^0.22.0", - "codemirror": "git+https://github.com/hackmdio/CodeMirror.git", + "codemirror": "git+https://github.com/hedgedoc/CodeMirror.git", "compression": "^1.6.2", "connect-flash": "^0.1.1", "connect-session-sequelize": "^6.0.0", - "cookie": "0.3.1", - "cookie-parser": "1.4.3", + "cookie": "^0.4.0", + "cookie-parser": "^1.4.3", "deep-freeze": "^0.0.1", "diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git", "ejs": "^2.5.5", - "emojify.js": "~1.1.0", + "emojify.js": "^1.1.0", "escape-html": "^1.0.3", "express": ">=4.14", "express-session": "^1.14.2", "file-saver": "^1.3.3", + "file-type": "^16.1.0", "flowchart.js": "^1.6.4", "fork-awesome": "^1.1.3", "formidable": "^1.0.17", - "gist-embed": "~2.6.0", + "gist-embed": "^2.6.0", "graceful-fs": "^4.1.11", "handlebars": "^4.5.2", "helmet": "^3.21.1", - "highlight.js": "~9.12.0", - "i18n": "^0.8.3", + "highlight.js": "^9.12.0", + "i18n": "^0.13.0", "imgur": "git+https://github.com/hackmdio/node-imgur.git", - "ionicons": "~2.0.1", - "jquery": "^3.4.1", + "ionicons": "^2.0.1", + "jquery": "^3.5.1", "jquery-mousewheel": "^3.1.13", "jquery-ui": "^1.12.1", "js-cookie": "^2.1.3", - "js-sequence-diagrams": "git+https://github.com/codimd/js-sequence-diagrams.git", + "js-sequence-diagrams": "git+https://github.com/hedgedoc/js-sequence-diagrams.git", "js-yaml": "^3.13.1", "jsdom-nogyp": "^0.8.3", "keymaster": "^1.6.2", "list.js": "^1.5.0", - "lodash": "^4.17.11", + "lodash": "^4.17.20", "lutim": "^1.0.2", "lz-string": "git+https://github.com/hackmdio/lz-string.git", "mariadb": "^2.1.2", @@ -79,11 +81,10 @@ "markdown-it-regexp": "^0.4.0", "markdown-it-sub": "^1.0.0", "markdown-it-sup": "^1.0.0", - "markdown-pdf": "^10.0.0", - "mathjax": "~2.7.6", + "mathjax": "^2.7.6", "mattermost": "^3.4.0", - "mermaid": "~8.4.6", - "meta-marked": "git+https://github.com/codimd/meta-marked#semver:^0.4.5", + "mermaid": "^8.5.1", + "meta-marked": "git+https://github.com/hedgedoc/meta-marked", "method-override": "^2.3.7", "minimist": "^1.2.0", "minio": "^6.0.0", @@ -103,22 +104,23 @@ "passport-twitter": "^1.0.4", "passport.socketio": "^3.7.0", "pdfobject": "^2.0.201604172", - "pg": "^7.12.1", + "pg": "^8.2.1", "pg-hstore": "^2.3.3", - "prismjs": "^1.6.0", - "randomcolor": "^0.5.3", - "raphael": "git+https://github.com/dmitrybaranovskiy/raphael", + "prismjs": "^1.21.0", + "randomcolor": "^0.6.0", + "raphael": "^2.3.0", "readline-sync": "^1.4.7", "request": "^2.88.0", - "reveal.js": "~3.9.2", + "reveal.js": "^3.9.2", + "rimraf": "^3.0.2", "scrypt-async": "^2.0.1", "scrypt-kdf": "^2.0.1", "select2": "^3.5.2-browserify", "sequelize": "^5.21.1", "sequelize-cli": "^5.5.1", - "shortid": "2.2.8", - "socket.io": "~2.1.1", - "socket.io-client": "~2.1.1", + "shortid": "2.2.16", + "socket.io": "^2.1.1", + "socket.io-client": "^2.1.1", "spin.js": "^2.3.2", "sqlite3": "^4.1.0", "store": "^2.0.12", @@ -137,20 +139,20 @@ "xss": "^1.0.3" }, "resolutions": { - "**/tough-cookie": "~2.4.0", + "**/tough-cookie": "~2.5.0", "**/minimatch": "^3.0.2", "**/request": "^2.88.0" }, "engines": { - "node": ">=8.x" + "node": ">=10.13" }, - "bugs": "https://github.com/codimd/server/issues", + "bugs": "https://github.com/hedgedoc/hedgedoc/issues", "keywords": [ "Collaborative", "Markdown", "Notes" ], - "homepage": "https://codimd.org", + "homepage": "https://hedgedoc.org", "maintainers": [ { "name": "Claudius Coenen", @@ -164,42 +166,43 @@ ], "repository": { "type": "git", - "url": "https://github.com/codimd/server.git" + "url": "https://github.com/hedgedoc/hedgedoc.git" }, "devDependencies": { - "babel-cli": "^6.26.0", - "babel-core": "^6.26.3", - "babel-loader": "^7.1.4", - "babel-plugin-transform-runtime": "^6.23.0", - "babel-polyfill": "^6.26.0", - "babel-preset-env": "^1.7.0", - "babel-runtime": "^6.26.0", - "copy-webpack-plugin": "^5.0.5", - "css-loader": "^3.2.0", - "eslint": "^5.9.0", - "eslint-config-standard": "^12.0.0", - "eslint-plugin-import": "^2.14.0", - "eslint-plugin-node": "^8.0.0", - "eslint-plugin-promise": "^4.0.1", - "eslint-plugin-standard": "^4.0.0", - "expose-loader": "^0.7.5", - "file-loader": "^4.3.0", - "html-webpack-plugin": "^4.0.0-beta.11", - "imports-loader": "^0.8.0", - "jsonlint": "^1.6.2", - "less": "^3.10.3", - "less-loader": "^5.0.0", - "mini-css-extract-plugin": "^0.8.0", - "mocha": "^5.2.0", - "mock-require": "^3.0.3", - "optimize-css-assets-webpack-plugin": "^5.0.3", - "script-loader": "^0.7.2", - "string-loader": "^0.0.1", - "style-loader": "^1.0.0", - "url-loader": "^2.3.0", - "webpack": "^4.41.2", - "webpack-cli": "^3.3.10", - "webpack-merge": "^4.2.2" + "babel-cli": "6.26.0", + "babel-core": "6.26.3", + "babel-loader": "7.1.5", + "babel-plugin-transform-runtime": "6.23.0", + "babel-polyfill": "6.26.0", + "babel-preset-env": "1.7.0", + "babel-runtime": "6.26.0", + "copy-webpack-plugin": "6.4.1", + "css-loader": "3.6.0", + "eslint": "5.16.0", + "eslint-config-standard": "12.0.0", + "eslint-plugin-import": "2.22.1", + "eslint-plugin-node": "8.0.1", + "eslint-plugin-promise": "4.2.1", + "eslint-plugin-standard": "4.1.0", + "expose-loader": "0.7.5", + "file-loader": "4.3.0", + "html-webpack-plugin": "4.5.0", + "imports-loader": "0.8.0", + "jsonlint": "1.6.3", + "less": "3.13.1", + "less-loader": "5.0.0", + "mini-css-extract-plugin": "0.12.0", + "mocha": "5.2.0", + "mock-require": "3.0.3", + "optimize-css-assets-webpack-plugin": "5.0.4", + "remark-cli": "8.0.1", + "remark-preset-lint-markdown-style-guide": "3.0.1", + "script-loader": "0.7.2", + "string-loader": "0.0.1", + "url-loader": "2.3.0", + "webpack": "4.44.2", + "webpack-cli": "3.3.12", + "webpack-merge": "4.2.2" }, "optionalDependencies": { "bufferutil": "^4.0.0", diff --git a/pkgs/servers/web-apps/codimd/yarn.lock b/pkgs/servers/web-apps/hedgedoc/yarn.lock index 46474683679d0..f228af65b5b62 100644 --- a/pkgs/servers/web-apps/codimd/yarn.lock +++ b/pkgs/servers/web-apps/hedgedoc/yarn.lock @@ -8,9 +8,9 @@ integrity sha512-l7z0DPCi2Hp88w12JhDTtx5d0Y3+vhfE7JKJb9O7sEz71Cwp053N8piTtTnnk/tUor9oZHgEKi/p3tQQmLPjvA== "@azure/ms-rest-js@^1.8.7": - version "1.8.14" - resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-1.8.14.tgz#657fc145db20b6eb3d58d1a2055473aa72eb609d" - integrity sha512-IrCPN22c8RbKWA06ZXuFwwEb15cSnr0zZ6J8Fspp9ns1SSNTERf7hv+gWvTIis1FlwHy42Mfk8hVu0/r3a0AWA== + version "1.9.0" + resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-1.9.0.tgz#5eb6516cf20e972a2eb4c589d6b48c3151bc801b" + integrity sha512-cB4Z2Mg7eBmet1rfbf0QSO1XbhfknRW7B+mX3IHJq0KGHaGJvCPoVTgdsJdCkazEMK1jtANFNEDDzSQacxyzbA== dependencies: "@types/tunnel" "0.0.0" axios "^0.19.0" @@ -31,19 +31,24 @@ adal-node "^0.1.28" "@babel/code-frame@^7.0.0": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" - integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g== + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== dependencies: - "@babel/highlight" "^7.8.3" + "@babel/highlight" "^7.10.4" + +"@babel/helper-validator-identifier@^7.10.4": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" + integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== -"@babel/highlight@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797" - integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg== +"@babel/highlight@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" + integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== dependencies: + "@babel/helper-validator-identifier" "^7.10.4" chalk "^2.0.0" - esutils "^2.0.2" js-tokens "^4.0.0" "@braintree/sanitize-url@^3.1.0": @@ -51,6 +56,43 @@ resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz#8ff71d51053cd5ee4981e5a501d80a536244f7fd" integrity sha512-GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg== +"@dabh/diagnostics@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz#290d08f7b381b8f94607dc8f471a12c675f9db31" + integrity sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q== + dependencies: + colorspace "1.1.x" + enabled "2.0.x" + kuler "^2.0.0" + +"@nodelib/fs.scandir@2.1.3": + version "2.1.3" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b" + integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw== + dependencies: + "@nodelib/fs.stat" "2.0.3" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3" + integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA== + +"@nodelib/fs.walk@^1.2.3": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976" + integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ== + dependencies: + "@nodelib/fs.scandir" "2.1.3" + fastq "^1.6.0" + +"@npmcli/move-file@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464" + integrity sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw== + dependencies: + mkdirp "^1.0.4" + "@passport-next/passport-openid@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@passport-next/passport-openid/-/passport-openid-1.0.0.tgz#d3b5e067a9aa1388ed172ab7cc02c39b8634283d" @@ -64,6 +106,16 @@ resolved "https://registry.yarnpkg.com/@passport-next/passport-strategy/-/passport-strategy-1.1.0.tgz#4c0df069e2ec9262791b9ef1e23320c1d73bdb74" integrity sha512-2KhFjtPueJG6xVj2HnqXt9BlANOfYCVLyu+pXYjPGBDT8yk+vQwc/6tsceIj+mayKcoxMau2JimggXRPHgoc8w== +"@tokenizer/token@^0.1.0", "@tokenizer/token@^0.1.1": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.1.1.tgz#f0d92c12f87079ddfd1b29f614758b9696bc29e3" + integrity sha512-XO6INPbZCxdprl+9qa/AAbFFOMzzwqYxpjPgLICrMD6C2FCw6qfJOPcBk6JqqPLSaZ/Qx87qn4rpPmPMwaAK6w== + +"@types/anymatch@*": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a" + integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA== + "@types/body-parser@*": version "1.19.0" resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f" @@ -79,26 +131,28 @@ dependencies: "@types/node" "*" -"@types/estree@0.0.39": - version "0.0.39" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" - integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== +"@types/debug@^4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" + integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== "@types/express-serve-static-core@*": - version "4.17.2" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz#f6f41fa35d42e79dbf6610eccbb2637e6008a0cf" - integrity sha512-El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg== + version "4.17.13" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.13.tgz#d9af025e925fc8b089be37423b8d1eac781be084" + integrity sha512-RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA== dependencies: "@types/node" "*" + "@types/qs" "*" "@types/range-parser" "*" "@types/express@*": - version "4.17.2" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.2.tgz#a0fb7a23d8855bac31bc01d5a58cadd9b2173e6c" - integrity sha512-5mHFNyavtLoJmnusB8OKJ5bshSzw+qkMIBAobLrIM48HJvunFva9mOa6aBwh64lBFyNwBbs0xiEFuj4eU/NjCA== + version "4.17.9" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.9.tgz#f5f2df6add703ff28428add52bdec8a1091b0a78" + integrity sha512-SDzEIZInC4sivGIFY4Sz1GG6J9UObPwCInYJjko2jzOf/Imx/dlpume6Xxwj1ORL82tBbmN4cPDIDkLbWHk9hw== dependencies: "@types/body-parser" "*" "@types/express-serve-static-core" "*" + "@types/qs" "*" "@types/serve-static" "*" "@types/geojson@^7946.0.7": @@ -106,70 +160,100 @@ resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad" integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ== +"@types/html-minifier-terser@^5.0.0": + version "5.1.1" + resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50" + integrity sha512-giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA== + +"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": + version "7.0.6" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" + integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== + +"@types/json5@^0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= + "@types/ldapjs@^1.0.0": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.5.tgz#2b078dff23dc068e12a8236b280d5fb4fd9db4db" - integrity sha512-hrtMZjVfWNPxkwFkYhLAU0ITZ3/reDft4jDzLBvrGDSKCbEvW+GeZb4PgM3jlSwSsv0cXqnDeWcupFLIgW9E0Q== + version "1.0.9" + resolved "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.9.tgz#1224192d14cc5ab5218fcea72ebb04489c52cb95" + integrity sha512-3PvY7Drp1zoLbcGlothCAkoc5o6Jp9KvUPwHadlHyKp3yPvyeIh7w2zQc9UXMzgDRkoeGXUEODtbEs5XCh9ZyA== dependencies: "@types/node" "*" "@types/mime@*": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d" - integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw== - -"@types/node@*", "@types/node@>=8.0.0": - version "13.7.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.1.tgz#238eb34a66431b71d2aaddeaa7db166f25971a0d" - integrity sha512-Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA== + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.3.tgz#c893b73721db73699943bfc3653b1deb7faa4a3a" + integrity sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q== -"@types/node@^10.12.12", "@types/node@^10.12.26": - version "10.17.15" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.15.tgz#bfff4e23e9e70be6eec450419d51e18de1daf8e7" - integrity sha512-daFGV9GSs6USfPgxceDA8nlSe48XrVCJfDeYm7eokxq/ye7iuOH87hKXgMtEAVLFapkczbZsx868PMDT1Y0a6A== +"@types/node@*": + version "14.14.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.7.tgz#8ea1e8f8eae2430cf440564b98c6dfce1ec5945d" + integrity sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg== "@types/node@^12.12.17": - version "12.12.27" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.27.tgz#d7506f73160ad30fcebbcf5b8b7d2d976e649e42" - integrity sha512-odQFl/+B9idbdS0e8IxDl2ia/LP8KZLXhV3BUeI98TrZp0uoIzQPhGd+5EtzHmT0SMOIaPd7jfz6pOHLWTtl7A== + version "12.19.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.4.tgz#cdfbb62e26c7435ed9aab9c941393cc3598e9b46" + integrity sha512-o3oj1bETk8kBwzz1WlO6JWL/AfAA3Vm6J1B3C9CsdxHYp7XgPiH7OEXPUbZTndHlRaIElrANkQfe6ZmfJb3H2w== + +"@types/node@^14.14.7": + version "14.14.14" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.14.tgz#f7fd5f3cc8521301119f63910f0fb965c7d761ae" + integrity sha512-UHnOPWVWV1z+VV8k6L1HhG7UbGBgIdghqF3l9Ny9ApPghbjICXkUJSd/b9gOgQfjM1r+37cipdw/HJ3F6ICEnQ== "@types/node@^8.0.47": - version "8.10.59" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.59.tgz#9e34261f30183f9777017a13d185dfac6b899e04" - integrity sha512-8RkBivJrDCyPpBXhVZcjh7cQxVBSmRk9QM7hOketZzp6Tg79c0N8kkpAIito9bnJ3HCVCHVYz+KHTEbfQNfeVQ== + version "8.10.66" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz#dd035d409df322acc83dff62a602f12a5783bbb3" + integrity sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw== "@types/passport@^1.0.0": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.2.tgz#f085033e2b301b1f97d4b57bfa73d8e934650c63" - integrity sha512-Pf39AYKf8q+YoONym3150cEwfUD66dtwHJWvbeOzKxnA0GZZ/vAXhNWv9vMhKyRQBQZiQyWQnhYBEBlKW6G8wg== + version "1.0.4" + resolved "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.4.tgz#1b35c4e197560d3974fa5f71711b6e9cce0711f0" + integrity sha512-h5OfAbfBBYSzjeU0GTuuqYEk9McTgWeGQql9g3gUw2/NNCfD7VgExVRYJVVeU13Twn202Mvk9BT0bUrl30sEgA== dependencies: "@types/express" "*" "@types/q@^1.5.1": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8" - integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw== + version "1.5.4" + resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" + integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== + +"@types/qs@*": + version "6.9.5" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.5.tgz#434711bdd49eb5ee69d90c1d67c354a9a8ecb18b" + integrity sha512-/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ== "@types/range-parser@*": version "1.2.3" resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c" integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== -"@types/readable-stream@^2.3.5": - version "2.3.5" - resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.5.tgz#99c215f9c78563ebdfeff400246a724fb36bae4a" - integrity sha512-Mq2eLkGYamlcolW603FY2ROBvcl90jPF+3jLkjpBV6qS+2aVeJqlgRG0TVAa1oWbmPdb5yOWlOPVvQle76nUNw== +"@types/readable-stream@^2.3.5", "@types/readable-stream@^2.3.9": + version "2.3.9" + resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.9.tgz#40a8349e6ace3afd2dd1b6d8e9b02945de4566a9" + integrity sha512-sqsgQqFT7HmQz/V5jH1O0fvQQnXAJO46Gg9LRO/JPfjmVmGUlcx831TZZO3Y3HtWhIkzf3kTsNT0Z0kzIhIvZw== dependencies: "@types/node" "*" safe-buffer "*" "@types/serve-static@*": - version "1.13.3" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.3.tgz#eb7e1c41c4468272557e897e9171ded5e2ded9d1" - integrity sha512-oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g== + version "1.13.7" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.7.tgz#e51b51a0becda910f9fd04c718044da69d6c492e" + integrity sha512-3diZWucbR+xTmbDlU+FRRxBf+31OhFew7cJXML/zh9NmvSPTNoFecAwHB66BUqFgENJtqMiyl7JAwUE/siqdLw== dependencies: - "@types/express-serve-static-core" "*" "@types/mime" "*" + "@types/node" "*" + +"@types/source-list-map@*": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" + integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA== + +"@types/tapable@*", "@types/tapable@^1.0.5": + version "1.0.6" + resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74" + integrity sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA== "@types/tunnel@0.0.0": version "0.0.0" @@ -178,150 +262,182 @@ dependencies: "@types/node" "*" -"@webassemblyjs/ast@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" - integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ== +"@types/uglify-js@*": + version "3.11.1" + resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.11.1.tgz#97ff30e61a0aa6876c270b5f538737e2d6ab8ceb" + integrity sha512-7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q== dependencies: - "@webassemblyjs/helper-module-context" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/wast-parser" "1.8.5" + source-map "^0.6.1" -"@webassemblyjs/floating-point-hex-parser@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721" - integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ== +"@types/unist@^2.0.0", "@types/unist@^2.0.2": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e" + integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ== -"@webassemblyjs/helper-api-error@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7" - integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA== +"@types/webpack-sources@*": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.0.0.tgz#08216ab9be2be2e1499beaebc4d469cec81e82a7" + integrity sha512-a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg== + dependencies: + "@types/node" "*" + "@types/source-list-map" "*" + source-map "^0.7.3" -"@webassemblyjs/helper-buffer@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204" - integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q== +"@types/webpack@^4.41.8": + version "4.41.25" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.25.tgz#4d3b5aecc4e44117b376280fbfd2dc36697968c4" + integrity sha512-cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ== + dependencies: + "@types/anymatch" "*" + "@types/node" "*" + "@types/tapable" "*" + "@types/uglify-js" "*" + "@types/webpack-sources" "*" + source-map "^0.6.0" -"@webassemblyjs/helper-code-frame@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e" - integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ== +"@webassemblyjs/ast@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" + integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA== dependencies: - "@webassemblyjs/wast-printer" "1.8.5" + "@webassemblyjs/helper-module-context" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/wast-parser" "1.9.0" -"@webassemblyjs/helper-fsm@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452" - integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow== +"@webassemblyjs/floating-point-hex-parser@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" + integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA== -"@webassemblyjs/helper-module-context@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245" - integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g== +"@webassemblyjs/helper-api-error@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" + integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw== + +"@webassemblyjs/helper-buffer@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" + integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA== + +"@webassemblyjs/helper-code-frame@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27" + integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA== dependencies: - "@webassemblyjs/ast" "1.8.5" - mamacro "^0.0.3" + "@webassemblyjs/wast-printer" "1.9.0" -"@webassemblyjs/helper-wasm-bytecode@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61" - integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ== +"@webassemblyjs/helper-fsm@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8" + integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw== -"@webassemblyjs/helper-wasm-section@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf" - integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA== +"@webassemblyjs/helper-module-context@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07" + integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g== dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-buffer" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/wasm-gen" "1.8.5" + "@webassemblyjs/ast" "1.9.0" -"@webassemblyjs/ieee754@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e" - integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g== +"@webassemblyjs/helper-wasm-bytecode@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" + integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw== + +"@webassemblyjs/helper-wasm-section@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" + integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-buffer" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/wasm-gen" "1.9.0" + +"@webassemblyjs/ieee754@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" + integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg== dependencies: "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/leb128@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10" - integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A== +"@webassemblyjs/leb128@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" + integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw== dependencies: "@xtuc/long" "4.2.2" -"@webassemblyjs/utf8@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc" - integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw== +"@webassemblyjs/utf8@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" + integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w== -"@webassemblyjs/wasm-edit@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a" - integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-buffer" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/helper-wasm-section" "1.8.5" - "@webassemblyjs/wasm-gen" "1.8.5" - "@webassemblyjs/wasm-opt" "1.8.5" - "@webassemblyjs/wasm-parser" "1.8.5" - "@webassemblyjs/wast-printer" "1.8.5" - -"@webassemblyjs/wasm-gen@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc" - integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg== +"@webassemblyjs/wasm-edit@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf" + integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-buffer" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/helper-wasm-section" "1.9.0" + "@webassemblyjs/wasm-gen" "1.9.0" + "@webassemblyjs/wasm-opt" "1.9.0" + "@webassemblyjs/wasm-parser" "1.9.0" + "@webassemblyjs/wast-printer" "1.9.0" + +"@webassemblyjs/wasm-gen@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" + integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA== dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/ieee754" "1.8.5" - "@webassemblyjs/leb128" "1.8.5" - "@webassemblyjs/utf8" "1.8.5" + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/ieee754" "1.9.0" + "@webassemblyjs/leb128" "1.9.0" + "@webassemblyjs/utf8" "1.9.0" -"@webassemblyjs/wasm-opt@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264" - integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q== +"@webassemblyjs/wasm-opt@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" + integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A== dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-buffer" "1.8.5" - "@webassemblyjs/wasm-gen" "1.8.5" - "@webassemblyjs/wasm-parser" "1.8.5" + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-buffer" "1.9.0" + "@webassemblyjs/wasm-gen" "1.9.0" + "@webassemblyjs/wasm-parser" "1.9.0" -"@webassemblyjs/wasm-parser@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d" - integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw== +"@webassemblyjs/wasm-parser@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" + integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA== dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-api-error" "1.8.5" - "@webassemblyjs/helper-wasm-bytecode" "1.8.5" - "@webassemblyjs/ieee754" "1.8.5" - "@webassemblyjs/leb128" "1.8.5" - "@webassemblyjs/utf8" "1.8.5" + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-api-error" "1.9.0" + "@webassemblyjs/helper-wasm-bytecode" "1.9.0" + "@webassemblyjs/ieee754" "1.9.0" + "@webassemblyjs/leb128" "1.9.0" + "@webassemblyjs/utf8" "1.9.0" -"@webassemblyjs/wast-parser@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c" - integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg== - dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/floating-point-hex-parser" "1.8.5" - "@webassemblyjs/helper-api-error" "1.8.5" - "@webassemblyjs/helper-code-frame" "1.8.5" - "@webassemblyjs/helper-fsm" "1.8.5" +"@webassemblyjs/wast-parser@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914" + integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw== + dependencies: + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/floating-point-hex-parser" "1.9.0" + "@webassemblyjs/helper-api-error" "1.9.0" + "@webassemblyjs/helper-code-frame" "1.9.0" + "@webassemblyjs/helper-fsm" "1.9.0" "@xtuc/long" "4.2.2" -"@webassemblyjs/wast-printer@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc" - integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg== +"@webassemblyjs/wast-printer@1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" + integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA== dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/wast-parser" "1.8.5" + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/wast-parser" "1.9.0" "@xtuc/long" "4.2.2" "@xtuc/ieee754@^1.2.0": @@ -344,9 +460,9 @@ JSV@^4.0.x: integrity sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c= abab@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a" - integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg== + version "2.0.5" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" + integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== abbrev@1: version "1.1.1" @@ -361,11 +477,6 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" -acorn-dynamic-import@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948" - integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw== - acorn-globals@^4.1.0: version "4.3.4" resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7" @@ -374,35 +485,25 @@ acorn-globals@^4.1.0: acorn "^6.0.1" acorn-walk "^6.0.1" -acorn-jsx@^5.0.0, acorn-jsx@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384" - integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw== +acorn-jsx@^5.0.0: + version "5.3.1" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" + integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== acorn-walk@^6.0.1: version "6.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c" integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA== -acorn-walk@^7.0.0: - version "7.1.1" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e" - integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ== - acorn@^5.5.3: - version "5.7.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" - integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== + version "5.7.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" + integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg== -acorn@^6.0.1, acorn@^6.0.7, acorn@^6.1.1, acorn@^6.2.1: - version "6.4.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784" - integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw== - -acorn@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c" - integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ== +acorn@^6.0.1, acorn@^6.0.7, acorn@^6.4.1: + version "6.4.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" + integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== adal-node@^0.1.28: version "0.1.28" @@ -424,45 +525,39 @@ after@0.8.2: resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + ajv-errors@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== -ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da" - integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== +ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv@^6.1.0, ajv@^6.10.2, ajv@^6.5.5, ajv@^6.9.1: - version "6.11.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9" - integrity sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA== +ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== dependencies: fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.4.1" uri-js "^4.2.2" -align-text@^0.1.1, align-text@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" - integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc= - dependencies: - kind-of "^3.0.2" - longest "^1.0.1" - repeat-string "^1.5.2" - alphanum-sort@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= -ansi-colors@^3.0.0: - version "3.2.4" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" - integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== - ansi-escapes@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" @@ -483,6 +578,11 @@ ansi-regex@^4.1.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -495,16 +595,18 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" +ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + ansi-styles@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178" integrity sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg= -ansicolors@~0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979" - integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk= - any-promise@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" @@ -526,36 +628,47 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" +anymatch@~3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" + integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== -archiver-utils@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-1.3.0.tgz#e50b4c09c70bf3d680e32ff1b7994e9f9d895174" - integrity sha1-5QtMCccL89aA4y/xt5lOn52JUXQ= +archiver-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2" + integrity sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw== dependencies: - glob "^7.0.0" - graceful-fs "^4.1.0" + glob "^7.1.4" + graceful-fs "^4.2.0" lazystream "^1.0.0" - lodash "^4.8.0" - normalize-path "^2.0.0" + lodash.defaults "^4.2.0" + lodash.difference "^4.5.0" + lodash.flatten "^4.4.0" + lodash.isplainobject "^4.0.6" + lodash.union "^4.6.0" + normalize-path "^3.0.0" readable-stream "^2.0.0" -archiver@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/archiver/-/archiver-2.1.1.tgz#ff662b4a78201494a3ee544d3a33fe7496509ebc" - integrity sha1-/2YrSnggFJSj7lRNOjP+dJZQnrw= +archiver@^5.0.2: + version "5.1.0" + resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.1.0.tgz#05b0f6f7836f3e6356a0532763d2bb91017a7e37" + integrity sha512-iKuQUP1nuKzBC2PFlGet5twENzCfyODmvkxwDV0cEFXavwcLrIW5ssTuHi9dyTPvpWr6Faweo2eQaQiLIwyXTA== dependencies: - archiver-utils "^1.3.0" - async "^2.0.0" + archiver-utils "^2.1.0" + async "^3.2.0" buffer-crc32 "^0.2.1" - glob "^7.0.0" - lodash "^4.8.0" - readable-stream "^2.0.0" - tar-stream "^1.5.0" - zip-stream "^1.2.0" + readable-stream "^3.6.0" + readdir-glob "^1.0.0" + tar-stream "^2.1.4" + zip-stream "^4.0.4" are-we-there-yet@~1.1.2: version "1.1.5" @@ -565,7 +678,7 @@ are-we-there-yet@~1.1.2: delegates "^1.0.0" readable-stream "^2.0.6" -argparse@^1.0.10, argparse@^1.0.7: +argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -604,7 +717,7 @@ array-flatten@1.1.1: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= -array-includes@^3.0.3: +array-includes@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348" integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ== @@ -613,17 +726,10 @@ array-includes@^3.0.3: es-abstract "^1.17.0" is-string "^1.0.5" -array-union@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" - integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk= - dependencies: - array-uniq "^1.0.1" - -array-uniq@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" - integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== array-unique@^0.2.1: version "0.2.1" @@ -635,7 +741,7 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= -array.prototype.flat@^1.2.1: +array.prototype.flat@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b" integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ== @@ -648,19 +754,20 @@ arraybuffer.slice@~0.0.7: resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675" integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog== -asap@^2.0.0, asap@~2.0.3: +asap@^2.0.0: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= -asn1.js@^4.0.0: - version "4.10.1" - resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0" - integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw== +asn1.js@^5.2.0: + version "5.4.1" + resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" + integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA== dependencies: bn.js "^4.0.0" inherits "^2.0.1" minimalistic-assert "^1.0.0" + safer-buffer "^2.1.0" asn1@0.2.3: version "0.2.3" @@ -712,17 +819,17 @@ async-limiter@~1.0.0: resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== -async@>=0.6.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/async/-/async-3.1.1.tgz#dd3542db03de837979c9ebbca64ca01b06dc98df" - integrity sha512-X5Dj8hK1pJNC2Wzo2Rcp9FBVdJMGRR/S7V+lH46s8GVFhtbo5O4Le5GECCF/8PISVdkUA6mMPvgz7qTTD1rf1g== +async@>=0.6.0, async@^3.1.0, async@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" + integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== async@^1.4.0, async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo= -async@^2.0.0, async@^2.1.4, async@^2.6.1: +async@^2.1.4: version "2.6.3" resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== @@ -739,19 +846,12 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autolinker@^3.11.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-3.12.0.tgz#1184397c85828041975a3b3135032b7b931966c6" - integrity sha512-iQAz75LAZ0dmlaMaIXX0Z+X4yuI6gxONZ14h0YTO0j/3d9DltyD+qkbINpocVZ8oCjMSJUdBeRfrXzGf/zvGZQ== - dependencies: - tslib "^1.9.3" - -aws-sdk@^2.345.0: - version "2.619.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.619.0.tgz#daacd97fb8d948c10278071129c12908039ab542" - integrity sha512-qujQf27p3mrGZGCL+C+vXCEB08AMm6gS1572fgHrVLBXfy6SjhV4dzEYtt+ZptQm+8z0zuHsDqghJuBCcdpxqQ== +aws-sdk@^2.521.0: + version "2.817.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.817.0.tgz#3a97b690b0ec494cf8ee927affb3973cf26abcc8" + integrity sha512-DZIdWpkcqbqsCz0MEskHsyFaqc6Tk9XIFqXAg1AKHbOgC8nU45bz+Y2osX77pU01JkS/G7OhGtGmlKDrOPvFwg== dependencies: - buffer "4.9.1" + buffer "4.9.2" events "1.1.1" ieee754 "1.1.13" jmespath "0.15.0" @@ -767,9 +867,9 @@ aws-sign2@~0.7.0: integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= aws4@^1.8.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e" - integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug== + version "1.11.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" + integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== axios@^0.19.0: version "0.19.2" @@ -795,7 +895,7 @@ azure-storage@^2.7.0: xml2js "0.2.8" xmlbuilder "^9.0.7" -babel-cli@^6.26.0: +babel-cli@6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1" integrity sha1-UCq1SHTX24itALiHoGODzgPQAvE= @@ -826,7 +926,7 @@ babel-code-frame@^6.26.0: esutils "^2.0.2" js-tokens "^3.0.2" -babel-core@^6.26.0, babel-core@^6.26.3: +babel-core@6.26.3, babel-core@^6.26.0: version "6.26.3" resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA== @@ -978,7 +1078,7 @@ babel-helpers@^6.24.1: babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-loader@^7.1.4: +babel-loader@7.1.5: version "7.1.5" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.5.tgz#e3ee0cd7394aa557e013b02d3e492bfd07aa6d68" integrity sha512-iCHfbieL5d1LfOQeeVJEUyD9rTwBcP/fcEbRCfempxTDuqrKpu0AZjLAQHEQa3Yqyj9ORKe2iHfoj4rHLf7xpw== @@ -1231,7 +1331,7 @@ babel-plugin-transform-regenerator@^6.22.0: dependencies: regenerator-transform "^0.10.0" -babel-plugin-transform-runtime@^6.23.0: +babel-plugin-transform-runtime@6.23.0: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee" integrity sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4= @@ -1246,7 +1346,7 @@ babel-plugin-transform-strict-mode@^6.24.1: babel-runtime "^6.22.0" babel-types "^6.24.1" -babel-polyfill@^6.26.0: +babel-polyfill@6.26.0, babel-polyfill@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM= @@ -1255,7 +1355,7 @@ babel-polyfill@^6.26.0: core-js "^2.5.0" regenerator-runtime "^0.10.5" -babel-preset-env@^1.7.0: +babel-preset-env@1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a" integrity sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg== @@ -1304,7 +1404,7 @@ babel-register@^6.26.0: mkdirp "^0.5.1" source-map-support "^0.4.15" -babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0: +babel-runtime@6.26.0, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= @@ -1365,25 +1465,35 @@ backoff@^2.5.0: dependencies: precond "0.2" +bail@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" + integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ== + balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= +base64-arraybuffer@0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812" + integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI= + base64-arraybuffer@0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8" integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg= -base64-js@^1.0.2: - version "1.3.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" - integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== +base64-js@^1.0.2, base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -base64id@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6" - integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY= +base64id@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" + integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== base64url@3.x.x, base64url@^3.0.0: version "3.0.1" @@ -1403,7 +1513,7 @@ base@^0.11.1: mixin-deep "^1.2.0" pascalcase "^0.1.1" -basic-auth@~2.0.0: +basic-auth@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== @@ -1439,6 +1549,11 @@ binary-extensions@^1.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== +binary-extensions@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz#30fa40c9e7fe07dbc895678cd287024dea241dd9" + integrity sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ== + bindings@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" @@ -1446,29 +1561,21 @@ bindings@^1.5.0: dependencies: file-uri-to-path "1.0.0" -bl@^1.0.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c" - integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA== - dependencies: - readable-stream "^2.3.5" - safe-buffer "^5.1.1" - bl@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.0.tgz#3611ec00579fd18561754360b21e9f784500ff88" - integrity sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A== + version "3.0.1" + resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz#1cbb439299609e419b5a74d7fce2f8b37d8e5c6f" + integrity sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ== dependencies: readable-stream "^3.0.1" -blint@^1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/blint/-/blint-1.1.0.tgz#9fcc8134296651099062f8d2ee359e83c7bff8ba" - integrity sha512-XSNoVy5Hu6fE3xSL4M7EDrIL5UrxkMlSpOChF9rf3aEKyx1/hI/WIetmfS72JVcDUozbl7usaVt5hWx620Fjig== +bl@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489" + integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg== dependencies: - acorn "^7.0.0" - acorn-walk "^7.0.0" - nomnom "^1.8.1" + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" blob@0.0.5: version "0.0.5" @@ -1484,15 +1591,20 @@ block-stream2@^1.0.0: inherits "^2.0.1" readable-stream "^2.0.4" -bluebird@^3.5.0, bluebird@^3.5.3, bluebird@^3.5.5: +bluebird@^3.5.0, bluebird@^3.5.3, bluebird@^3.5.5, bluebird@^3.7.2: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: - version "4.11.8" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" - integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA== +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.4.0: + version "4.11.9" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828" + integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw== + +bn.js@^5.0.0, bn.js@^5.1.1: + version "5.1.3" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b" + integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ== body-parser@1.19.0, body-parser@^1.15.2: version "1.19.0" @@ -1525,7 +1637,7 @@ bootstrap@^3.4.0: resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72" integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA== -bowser@^2.7.0: +bowser@2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.9.0.tgz#3bed854233b419b9a7422d9ee3e85504373821c9" integrity sha512-2ld76tuLBNFekRgmJfT2+3j5MIrP6bFict8WAIT3beq+srz1gcKNAdNKMqHqauQt63NmAa88HfP1/Ypa9Er3HA== @@ -1563,15 +1675,22 @@ braces@^2.3.1, braces@^2.3.2: split-string "^3.0.2" to-regex "^3.0.1" +braces@^3.0.1, braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + brorand@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= -browser-process-hrtime@^0.1.2: - version "0.1.3" - resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4" - integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw== +browser-process-hrtime@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" + integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== browser-stdout@1.3.1: version "1.3.1" @@ -1614,26 +1733,28 @@ browserify-mime@~1.2.9: resolved "https://registry.yarnpkg.com/browserify-mime/-/browserify-mime-1.2.9.tgz#aeb1af28de6c0d7a6a2ce40adb68ff18422af31f" integrity sha1-rrGvKN5sDXpqLOQK22j/GEIq8x8= -browserify-rsa@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524" - integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ= +browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d" + integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog== dependencies: - bn.js "^4.1.0" + bn.js "^5.0.0" randombytes "^2.0.1" browserify-sign@^4.0.0: - version "4.0.4" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298" - integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg= - dependencies: - bn.js "^4.1.1" - browserify-rsa "^4.0.0" - create-hash "^1.1.0" - create-hmac "^1.1.2" - elliptic "^6.0.0" - inherits "^2.0.1" - parse-asn1 "^5.0.0" + version "4.2.1" + resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" + integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg== + dependencies: + bn.js "^5.1.1" + browserify-rsa "^4.0.1" + create-hash "^1.2.0" + create-hmac "^1.1.7" + elliptic "^6.5.3" + inherits "^2.0.4" + parse-asn1 "^5.1.5" + readable-stream "^3.6.0" + safe-buffer "^5.2.0" browserify-zlib@^0.2.0: version "0.2.0" @@ -1651,42 +1772,17 @@ browserslist@^3.2.6: electron-to-chromium "^1.3.47" browserslist@^4.0.0: - version "4.8.7" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.7.tgz#ec8301ff415e6a42c949d0e66b405eb539c532d0" - integrity sha512-gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA== - dependencies: - caniuse-lite "^1.0.30001027" - electron-to-chromium "^1.3.349" - node-releases "^1.1.49" - -buble@^0.19.8: - version "0.19.8" - resolved "https://registry.yarnpkg.com/buble/-/buble-0.19.8.tgz#d642f0081afab66dccd897d7b6360d94030b9d3d" - integrity sha512-IoGZzrUTY5fKXVkgGHw3QeXFMUNBFv+9l8a4QJKG1JhG3nCMHTdEX1DCOg8568E2Q9qvAQIiSokv6Jsgx8p2cA== - dependencies: - acorn "^6.1.1" - acorn-dynamic-import "^4.0.0" - acorn-jsx "^5.0.1" - chalk "^2.4.2" - magic-string "^0.25.3" - minimist "^1.2.0" - os-homedir "^2.0.0" - regexpu-core "^4.5.4" - -buffer-alloc-unsafe@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" - integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== - -buffer-alloc@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" - integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== + version "4.14.7" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6" + integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ== dependencies: - buffer-alloc-unsafe "^1.1.0" - buffer-fill "^1.0.0" + caniuse-lite "^1.0.30001157" + colorette "^1.2.1" + electron-to-chromium "^1.3.591" + escalade "^3.1.1" + node-releases "^1.1.66" -buffer-crc32@^0.2.1: +buffer-crc32@^0.2.1, buffer-crc32@^0.2.13: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= @@ -1696,11 +1792,6 @@ buffer-equal-constant-time@1.0.1: resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk= -buffer-fill@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" - integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= - buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" @@ -1716,16 +1807,7 @@ buffer-xor@^1.0.3: resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= -buffer@4.9.1: - version "4.9.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298" - integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg= - dependencies: - base64-js "^1.0.2" - ieee754 "^1.1.4" - isarray "^1.0.0" - -buffer@^4.3.0: +buffer@4.9.2, buffer@^4.3.0: version "4.9.2" resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg== @@ -1734,20 +1816,20 @@ buffer@^4.3.0: ieee754 "^1.1.4" isarray "^1.0.0" -buffer@^5.1.0: - version "5.4.3" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.4.3.tgz#3fbc9c69eb713d323e3fc1a895eee0710c072115" - integrity sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A== +buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== dependencies: - base64-js "^1.0.2" - ieee754 "^1.1.4" + base64-js "^1.3.1" + ieee754 "^1.1.13" bufferutil@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.1.tgz#3a177e8e5819a1243fe16b63a199951a7ad8d4a7" - integrity sha512-xowrxvpxojqkagPcWRQVXZl0YXhRhAtBEIq3VoER1NH5Mw1n1o0ojdspp+GS2J//2gCVyrzQDApQ4unGF+QOoA== + version "4.0.2" + resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.2.tgz#79f68631910f6b993d870fc77dc0a2894eb96cd5" + integrity sha512-AtnG3W6M8B2n4xDQ5R+70EXvOpnXsFYg/AK2yTZd+HQ/oxAdz+GI+DvjmhBw3L0ole+LJ0ngqY4JMbDzkfNzhA== dependencies: - node-gyp-build "~3.7.0" + node-gyp-build "^4.2.0" builtin-status-codes@^3.0.0: version "3.0.0" @@ -1755,12 +1837,12 @@ builtin-status-codes@^3.0.0: integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= bunyan@^1.8.3: - version "1.8.12" - resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.12.tgz#f150f0f6748abdd72aeae84f04403be2ef113797" - integrity sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c= + version "1.8.14" + resolved "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.14.tgz#3d8c1afea7de158a5238c7cb8a66ab6b38dd45b4" + integrity sha512-LlahJUxXzZLuw/hetUQJmRgZ1LF6+cr5TPpRj6jf327AsiIq2jhYEH4oqUUkVKTor+9w2BT3oxVwhzE5lw9tcg== optionalDependencies: dtrace-provider "~0.8" - moment "^2.10.6" + moment "^2.19.3" mv "~2" safe-json-stringify "~1" @@ -1774,10 +1856,10 @@ bytes@3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== -cacache@^12.0.2, cacache@^12.0.3: - version "12.0.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390" - integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw== +cacache@^12.0.2: + version "12.0.4" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" + integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ== dependencies: bluebird "^3.5.5" chownr "^1.1.1" @@ -1795,6 +1877,29 @@ cacache@^12.0.2, cacache@^12.0.3: unique-filename "^1.1.1" y18n "^4.0.0" +cacache@^15.0.5: + version "15.0.5" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0" + integrity sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A== + dependencies: + "@npmcli/move-file" "^1.0.1" + chownr "^2.0.0" + fs-minipass "^2.0.0" + glob "^7.1.4" + infer-owner "^1.0.4" + lru-cache "^6.0.0" + minipass "^3.1.1" + minipass-collect "^1.0.2" + minipass-flush "^1.0.5" + minipass-pipeline "^1.2.2" + mkdirp "^1.0.3" + p-map "^4.0.0" + promise-inflight "^1.0.1" + rimraf "^3.0.2" + ssri "^8.0.0" + tar "^6.0.2" + unique-filename "^1.1.1" + cache-base@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" @@ -1810,6 +1915,14 @@ cache-base@^1.0.1: union-value "^1.0.0" unset-value "^1.0.0" +call-bind@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce" + integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.0" + caller-callsite@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" @@ -1847,10 +1960,13 @@ camel-case@^3.0.0: no-case "^2.2.0" upper-case "^1.1.1" -camelcase@^1.0.2: - version "1.2.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" - integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk= +camel-case@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz#1fc41c854f00e2f7d0139dfeba1542d6896fe547" + integrity sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q== + dependencies: + pascal-case "^3.1.1" + tslib "^1.10.0" camelcase@^5.0.0, camelcase@^5.3.1: version "5.3.1" @@ -1872,40 +1988,20 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001027: - version "1.0.30001027" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001027.tgz#283e2ef17d94889cc216a22c6f85303d78ca852d" - integrity sha512-7xvKeErvXZFtUItTHgNtLgS9RJpVnwBlWX8jSo/BO8VsF6deszemZSkJJJA1KOKrXuzZH4WALpAJdq5EyfgMLg== - -cardinal@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-2.1.1.tgz#7cc1055d822d212954d07b085dea251cc7bc5505" - integrity sha1-fMEFXYItISlU0HsIXeolHMe8VQU= - dependencies: - ansicolors "~0.3.2" - redeyed "~2.1.0" +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001157: + version "1.0.30001157" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz#2d11aaeb239b340bc1aa730eca18a37fdb07a9ab" + integrity sha512-gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA== caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -center-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" - integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60= - dependencies: - align-text "^0.1.3" - lazy-cache "^1.0.3" - -chalk@2.4.2, chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" +ccount@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043" + integrity sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg== chalk@^1.1.3: version "1.1.3" @@ -1918,6 +2014,23 @@ chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" +chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + chalk@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f" @@ -1928,9 +2041,29 @@ chalk@~0.4.0: strip-ansi "~0.1.0" chance@^1.0.4: + version "1.1.7" + resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.7.tgz#e99dde5ac16681af787b5ba94c8277c090d6cfe8" + integrity sha512-bua/2cZEfzS6qPm0vi3JEvGNbriDLcMj9lKxCQOjUcCJRcyjA7umP0zZm6bKWWlBN04vA0L99QGH/CZQawr0eg== + +character-entities-html4@^1.0.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.4.tgz#0e64b0a3753ddbf1fdc044c5fd01d0199a02e125" + integrity sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g== + +character-entities-legacy@^1.0.0: version "1.1.4" - resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.4.tgz#d8743bf8e40bb05e024c305ca1ff441195eb23db" - integrity sha512-pXPDSu3knKlb6H7ahQfpq//J9mSOxYK8SMtp8MV/nRJh8aLRDIl0ipLH8At8+nVogVwtvPZzyIzY/EbcY/cLuQ== + resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" + integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA== + +character-entities@^1.0.0: + version "1.2.4" + resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" + integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw== + +character-reference-invalid@^1.0.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" + integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg== chardet@^0.7.0: version "0.7.0" @@ -1959,7 +2092,7 @@ cheerio@^0.22.0: lodash.reject "^4.4.0" lodash.some "^4.4.0" -chokidar@^1.6.1, chokidar@^1.7.0: +chokidar@^1.6.1: version "1.7.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg= @@ -1975,7 +2108,7 @@ chokidar@^1.6.1, chokidar@^1.7.0: optionalDependencies: fsevents "^1.0.0" -chokidar@^2.0.2: +chokidar@^2.1.8: version "2.1.8" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== @@ -1994,11 +2127,31 @@ chokidar@^2.0.2: optionalDependencies: fsevents "^1.2.7" +chokidar@^3.0.0, chokidar@^3.4.1: + version "3.4.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b" + integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ== + dependencies: + anymatch "~3.1.1" + braces "~3.0.2" + glob-parent "~5.1.0" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.5.0" + optionalDependencies: + fsevents "~2.1.2" + chownr@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + chrome-trace-event@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" @@ -2024,13 +2177,18 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" -clean-css@^4.1.6, clean-css@^4.2.1: +clean-css@^4.1.6, clean-css@^4.2.1, clean-css@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA== dependencies: source-map "~0.6.0" +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + cli-color@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/cli-color/-/cli-color-1.4.0.tgz#7d10738f48526824f8fe7da51857cb0f572fe01f" @@ -2051,28 +2209,19 @@ cli-cursor@^2.1.0: restore-cursor "^2.0.0" cli-width@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" - integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" + integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== clipboard@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.4.tgz#836dafd66cf0fea5d71ce5d5b0bf6e958009112d" - integrity sha512-Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ== + version "2.0.6" + resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz#52921296eec0fdf77ead1749421b21c968647376" + integrity sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg== dependencies: good-listener "^1.2.2" select "^1.1.2" tiny-emitter "^2.0.0" -cliui@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" - integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE= - dependencies: - center-align "^0.1.1" - right-align "^0.1.1" - wordwrap "0.0.2" - cliui@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" @@ -2082,7 +2231,7 @@ cliui@^5.0.0: strip-ansi "^5.2.0" wrap-ansi "^5.1.0" -clone@^2.1.1, clone@^2.1.2: +clone@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= @@ -2095,6 +2244,11 @@ cls-bluebird@^2.1.0: is-bluebird "^1.0.2" shimmer "^1.1.0" +co@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/co/-/co-3.1.0.tgz#4ea54ea5a08938153185e15210c68d9092bc1b78" + integrity sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g= + coa@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" @@ -2109,17 +2263,14 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= -"codemirror@git+https://github.com/hackmdio/CodeMirror.git": - version "5.49.3" - resolved "git+https://github.com/hackmdio/CodeMirror.git#2ac9b9f25707606b0c09b99decaf9d08dd434570" - dependencies: - blint "^1" - node-static "0.7.11" - phantomjs-prebuilt "^2.1.12" - rollup "^0.66.2" - rollup-plugin-buble "^0.19.2" - rollup-watch "^4.3.1" - uglify-js "^2.8.15" +"codemirror@git+https://github.com/hedgedoc/CodeMirror.git": + version "5.58.2" + resolved "git+https://github.com/hedgedoc/CodeMirror.git#f780b569b3717cdff4c8507538cc63101bfa02e1" + +collapse-white-space@^1.0.2: + version "1.0.6" + resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287" + integrity sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ== collection-visit@^1.0.0: version "1.0.0" @@ -2136,20 +2287,27 @@ color-convert@^1.9.0, color-convert@^1.9.1: dependencies: color-name "1.1.3" +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= -color-name@^1.0.0: +color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-string@^1.5.2: - version "1.5.3" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc" - integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw== +color-string@^1.5.2, color-string@^1.5.4: + version "1.5.4" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz#dd51cd25cfee953d138fe4002372cc3d0e504cb6" + integrity sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw== dependencies: color-name "^1.0.0" simple-swizzle "^0.2.2" @@ -2163,19 +2321,19 @@ color@3.0.x: color-string "^1.5.2" color@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz#68148e7f85d41ad7649c5fa8c8106f098d229e10" - integrity sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg== + version "3.1.3" + resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e" + integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ== dependencies: color-convert "^1.9.1" - color-string "^1.5.2" + color-string "^1.5.4" -colornames@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96" - integrity sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y= +colorette@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" + integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== -colors@>=0.6.0, colors@^1.2.1: +colors@^1.2.1: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== @@ -2195,7 +2353,7 @@ combined-stream@^1.0.5, combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -commander@2, commander@^2.11.0, commander@^2.13.0, commander@^2.19.0, commander@^2.20.0, commander@^2.9.0, commander@~2.20.3: +commander@2, commander@^2.11.0, commander@^2.13.0, commander@^2.19.0, commander@^2.20.0, commander@^2.20.3: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -2205,12 +2363,7 @@ commander@2.15.1: resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag== -commander@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e" - integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow== - -commander@^4.0.0: +commander@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== @@ -2230,7 +2383,7 @@ component-emitter@1.2.1, component-emitter@~1.2.0: resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= -component-emitter@^1.2.1: +component-emitter@^1.2.1, component-emitter@~1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== @@ -2240,15 +2393,15 @@ component-inherit@0.0.3: resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM= -compress-commons@^1.2.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.2.tgz#524a9f10903f3a813389b0225d27c48bb751890f" - integrity sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8= +compress-commons@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.2.tgz#d6896be386e52f37610cef9e6fa5defc58c31bd7" + integrity sha512-qhd32a9xgzmpfoga1VQEiLEwdKZ6Plnpx5UCgIsf89FSolyJ7WnifY4Gtjgv5WR6hWAyRaHxC5MiEhU/38U70A== dependencies: - buffer-crc32 "^0.2.1" - crc32-stream "^2.0.0" - normalize-path "^2.0.0" - readable-stream "^2.0.0" + buffer-crc32 "^0.2.13" + crc32-stream "^4.0.1" + normalize-path "^3.0.0" + readable-stream "^3.6.0" compressible@~2.0.16: version "2.0.18" @@ -2275,7 +2428,7 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-stream@1.6.2, concat-stream@^1.4.7, concat-stream@^1.4.8, concat-stream@^1.5.0: +concat-stream@^1.4.8, concat-stream@^1.5.0: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== @@ -2285,6 +2438,16 @@ concat-stream@1.6.2, concat-stream@^1.4.7, concat-stream@^1.4.8, concat-stream@^ readable-stream "^2.2.2" typedarray "^0.0.6" +concat-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1" + integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.0.2" + typedarray "^0.0.6" + config-chain@^1.1.12: version "1.1.12" resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa" @@ -2350,12 +2513,12 @@ convert-source-map@^1.5.0, convert-source-map@^1.5.1: dependencies: safe-buffer "~5.1.1" -cookie-parser@1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.3.tgz#0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5" - integrity sha1-D+MfoZ0AC5X0qt8fU/3CuKIDuqU= +cookie-parser@^1.4.3: + version "1.4.5" + resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.5.tgz#3e572d4b7c0c80f9c61daf604e4336831b5d1d49" + integrity sha512-f13bPUj/gG/5mDr+xLmSxxDsB9DQiTIfhJS/sqjrmfAWiAN+x2O4i/XguTL9yDZ+/IFDanJ+5x7hC4CXT9Tdzw== dependencies: - cookie "0.3.1" + cookie "0.4.0" cookie-signature "1.0.6" cookie-signature@1.0.6: @@ -2373,11 +2536,23 @@ cookie@0.4.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== +cookie@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" + integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== + cookiejar@2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.0.6.tgz#0abf356ad00d1c5a219d88d44518046dd026acfe" integrity sha1-Cr81atANHFohnYjURRgEbdAmrP4= +copy-anything@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.1.tgz#2afbce6da684bdfcbec93752fa762819cb480d9a" + integrity sha512-lA57e7viQHOdPQcrytv5jFeudZZOXuyk47lZym279FiDQ8jeZomXiGuVf6ffMKkJ+3TIai3J1J3yi6M+/4U35g== + dependencies: + is-what "^3.7.1" + copy-concurrently@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" @@ -2395,23 +2570,22 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -copy-webpack-plugin@^5.0.5: - version "5.1.1" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz#5481a03dea1123d88a988c6ff8b78247214f0b88" - integrity sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg== - dependencies: - cacache "^12.0.3" - find-cache-dir "^2.1.0" - glob-parent "^3.1.0" - globby "^7.1.1" - is-glob "^4.0.1" - loader-utils "^1.2.3" - minimatch "^3.0.4" +copy-webpack-plugin@6.4.1: + version "6.4.1" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.4.1.tgz#138cd9b436dbca0a6d071720d5414848992ec47e" + integrity sha512-MXyPCjdPVx5iiWyl40Va3JGh27bKzOTNY3NjUTrosD2q7dR/cLD0013uqJ3BpFbUjyONINjb6qI7nDIJujrMbA== + dependencies: + cacache "^15.0.5" + fast-glob "^3.2.4" + find-cache-dir "^3.3.1" + glob-parent "^5.1.1" + globby "^11.0.1" + loader-utils "^2.0.0" normalize-path "^3.0.0" - p-limit "^2.2.1" - schema-utils "^1.0.0" - serialize-javascript "^2.1.2" - webpack-log "^2.0.0" + p-limit "^3.0.2" + schema-utils "^3.0.0" + serialize-javascript "^5.0.1" + webpack-sources "^1.4.3" core-js@^2.4.0, core-js@^2.5.0: version "2.6.11" @@ -2433,30 +2607,31 @@ cosmiconfig@^5.0.0: js-yaml "^3.13.1" parse-json "^4.0.0" -crc32-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4" - integrity sha1-483TtN8xaN10494/u8t7KX/pCPQ= +crc-32@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208" + integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA== dependencies: - crc "^3.4.4" - readable-stream "^2.0.0" + exit-on-epipe "~1.0.1" + printj "~1.1.0" -crc@^3.4.4: - version "3.8.0" - resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" - integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ== +crc32-stream@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.1.tgz#0f047d74041737f8a55e86837a1b826bd8ab0067" + integrity sha512-FN5V+weeO/8JaXsamelVYO1PHyeCsuL3HcG4cqsj0ceARcocxalaShCsohZMSAF+db7UYFwBy1rARK/0oFItUw== dependencies: - buffer "^5.1.0" + crc-32 "^1.2.0" + readable-stream "^3.4.0" create-ecdh@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff" - integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw== + version "4.0.4" + resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" + integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A== dependencies: bn.js "^4.1.0" - elliptic "^6.0.0" + elliptic "^6.5.3" -create-hash@^1.1.0, create-hash@^1.1.2: +create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg== @@ -2467,7 +2642,7 @@ create-hash@^1.1.0, create-hash@^1.1.2: ripemd160 "^2.0.1" sha.js "^2.4.0" -create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: +create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg== @@ -2479,7 +2654,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5: +cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== @@ -2507,13 +2682,6 @@ crypto-browserify@^3.11.0: randombytes "^2.0.0" randomfill "^1.0.3" -crypto-random-string@^3.0.1: - version "3.1.0" - resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-3.1.0.tgz#0368382de82e914179ad2ca9c7a788e260184bae" - integrity sha512-Tip3yGB+bA7B0W8E4K4mNf2rZhu5r2G5Tb89/utEl5tP1QuLjTF/S9a1b8ifDrR4ORc9Utf6tscpSEtBY3YcPQ== - dependencies: - type-fest "^0.8.1" - css-b64-images@~0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/css-b64-images/-/css-b64-images-0.2.5.tgz#42005d83204b2b4a5d93b6b1a5644133b5927a02" @@ -2532,23 +2700,24 @@ css-declaration-sorter@^4.0.1: postcss "^7.0.1" timsort "^0.3.0" -css-loader@^3.2.0: - version "3.4.2" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.4.2.tgz#d3fdb3358b43f233b78501c5ed7b1c6da6133202" - integrity sha512-jYq4zdZT0oS0Iykt+fqnzVLRIeiPWhka+7BqPn+oSIpWJAHak5tmB/WZrJ2a21JhCeFyNnnlroSl8c+MtVndzA== +css-loader@3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645" + integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ== dependencies: camelcase "^5.3.1" cssesc "^3.0.0" icss-utils "^4.1.1" loader-utils "^1.2.3" normalize-path "^3.0.0" - postcss "^7.0.23" + postcss "^7.0.32" postcss-modules-extract-imports "^2.0.0" postcss-modules-local-by-default "^3.0.2" - postcss-modules-scope "^2.1.1" + postcss-modules-scope "^2.2.0" postcss-modules-values "^3.0.0" - postcss-value-parser "^4.0.2" - schema-utils "^2.6.0" + postcss-value-parser "^4.1.0" + schema-utils "^2.7.0" + semver "^6.3.0" css-select-base-adapter@^0.1.1: version "0.1.1" @@ -2583,10 +2752,13 @@ css-tree@1.0.0-alpha.37: mdn-data "2.0.4" source-map "^0.6.1" -css-unit-converter@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996" - integrity sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY= +css-tree@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.1.tgz#7726678dfe2a57993a018d9dce519bf1760e3b6d" + integrity sha512-WroX+2MvsYcRGP8QA0p+rxzOniT/zpAoQ/DTKDSJzh5T3IQKUkFHeIIfgIapm2uaP178GWY3Mime1qbk8GO/tA== + dependencies: + mdn-data "2.0.12" + source-map "^0.6.1" css-what@2.1: version "2.1.3" @@ -2594,14 +2766,9 @@ css-what@2.1: integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg== css-what@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.2.1.tgz#f4a8f12421064621b456755e34a03a2c22df5da1" - integrity sha512-WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw== - -cssesc@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703" - integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg== + version "3.4.2" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" + integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== cssesc@^3.0.0: version "3.0.0" @@ -2682,11 +2849,11 @@ cssnano@^4.1.10: postcss "^7.0.0" csso@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/csso/-/csso-4.0.2.tgz#e5f81ab3a56b8eefb7f0092ce7279329f454de3d" - integrity sha512-kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg== + version "4.1.0" + resolved "https://registry.yarnpkg.com/csso/-/csso-4.1.0.tgz#1d31193efa99b87aa6bad6c0cef155e543d09e8b" + integrity sha512-h+6w/W1WqXaJA4tb1dk7r5tVbOm97MsKxzwnvOR04UQ6GILroryjMWu3pmCCtL2mLaEStQ0fZgeGiy99mo7iyg== dependencies: - css-tree "1.0.0-alpha.37" + css-tree "^1.0.0" cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": version "0.3.8" @@ -2728,9 +2895,9 @@ d3-axis@1: integrity sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ== d3-brush@1: - version "1.1.5" - resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.5.tgz#066b8e84d17b192986030446c97c0fba7e1bacdc" - integrity sha512-rEaJ5gHlgLxXugWjIkolTA0OyMvw8UWU1imYXy1v642XyyswmI1ybKOv05Ft+ewq+TFmdliD3VuK0pRp1VT/5A== + version "1.1.6" + resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.6.tgz#b0a22c7372cabec128bdddf9bddc058592f89e9b" + integrity sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA== dependencies: d3-dispatch "1" d3-drag "1" @@ -2752,9 +2919,9 @@ d3-collection@1: integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A== d3-color@1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.0.tgz#89c45a995ed773b13314f06460df26d60ba0ecaf" - integrity sha512-TzNPeJy2+iEepfiL92LAAB7fvnp/dV2YwANPVHdDWmYMm23qIJBYww3qT8I8C1wXrmrg4UWs7BKc2tKIgyjzHg== + version "1.4.1" + resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a" + integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q== d3-contour@1: version "1.3.2" @@ -2786,14 +2953,14 @@ d3-dsv@1: rw "1" d3-ease@1: - version "1.0.6" - resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.6.tgz#ebdb6da22dfac0a22222f2d4da06f66c416a0ec0" - integrity sha512-SZ/lVU7LRXafqp7XtIcBdxnWl8yyLpgOmzAk0mWBI9gXNzLDx5ybZgnRbH9dN/yY5tzVBqCQ9avltSnqVwessQ== + version "1.0.7" + resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.7.tgz#9a834890ef8b8ae8c558b2fe55bd57f5993b85e2" + integrity sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ== d3-fetch@1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.1.2.tgz#957c8fbc6d4480599ba191b1b2518bf86b3e1be2" - integrity sha512-S2loaQCV/ZeyTyIF2oP8D1K9Z4QizUzW7cWeAOAS4U88qOt3Ucf6GsmgthuYSdyB2HyEm4CeGvkQxWsmInsIVA== + version "1.2.0" + resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.2.0.tgz#15ce2ecfc41b092b1db50abd2c552c2316cf7fc7" + integrity sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA== dependencies: d3-dsv "1" @@ -2808,14 +2975,14 @@ d3-force@1: d3-timer "1" d3-format@1: - version "1.4.3" - resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.3.tgz#4e8eb4dff3fdcb891a8489ec6e698601c41b96f1" - integrity sha512-mm/nE2Y9HgGyjP+rKIekeITVgBtX97o1nrvHCWX8F/yBYyevUTvu9vb5pUnKwrcSw7o7GuwMOWjS9gFDs4O+uQ== + version "1.4.5" + resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz#374f2ba1320e3717eb74a9356c67daee17a7edb4" + integrity sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ== d3-geo@1: - version "1.11.9" - resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.11.9.tgz#77eaed14ba62fc2c0aef55cd2943849c866f7ae6" - integrity sha512-9edcH6J3s/Aa3KJITWqFJbyB/8q3mMlA9Fi7z6yy+FAYMnRaxmC7jBhUnsINxVWD14GmqX3DK8uk7nV6/Ekt4A== + version "1.12.1" + resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.12.1.tgz#7fc2ab7414b72e59fbcbd603e80d9adc029b035f" + integrity sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg== dependencies: d3-array "1" @@ -2872,9 +3039,9 @@ d3-scale@2: d3-time-format "2" d3-selection@1, d3-selection@^1.1.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.1.tgz#98eedbbe085fbda5bafa2f9e3f3a2f4d7d622a98" - integrity sha512-BTIbRjv/m5rcVTfBs4AMBLKs4x8XaaLkwm28KWu9S2vKNqXkXt2AH2Qf0sdPZHjFxcWg/YL53zcqAz+3g4/7PA== + version "1.4.2" + resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c" + integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg== d3-shape@1: version "1.3.7" @@ -2884,9 +3051,9 @@ d3-shape@1: d3-path "1" d3-time-format@2: - version "2.2.3" - resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.2.3.tgz#0c9a12ee28342b2037e5ea1cf0b9eb4dd75f29cb" - integrity sha512-RAHNnD8+XvC4Zc4d2A56Uw0yJoM7bsvOlJR33bclxq399Rak/b9bhvu/InjxdWhPtkgU53JJcleJTGkNRnN6IA== + version "2.3.0" + resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.3.0.tgz#107bdc028667788a8924ba040faf1fbccd5a7850" + integrity sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ== dependencies: d3-time "1" @@ -2929,9 +3096,9 @@ d3-zoom@1: d3-transition "1" d3@^5.14, d3@^5.7.0: - version "5.15.0" - resolved "https://registry.yarnpkg.com/d3/-/d3-5.15.0.tgz#ffd44958e6a3cb8a59a84429c45429b8bca5677a" - integrity sha512-C+E80SL2nLLtmykZ6klwYj5rPqB5nlfN5LdWEAVdWPppqTD8taoJi2PxLZjPeYT8FFRR2yucXq+kBlOnnvZeLg== + version "5.16.0" + resolved "https://registry.yarnpkg.com/d3/-/d3-5.16.0.tgz#9c5e8d3b56403c79d4ed42fbd62f6113f199c877" + integrity sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw== dependencies: d3-array "1" d3-axis "1" @@ -3017,13 +3184,6 @@ date-utils@*: resolved "https://registry.yarnpkg.com/date-utils/-/date-utils-1.2.21.tgz#61fb16cdc1274b3c9acaaffe9fc69df8720a2b64" integrity sha1-YfsWzcEnSzyayq/+n8ad+HIKK2Q= -debug@*, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== - dependencies: - ms "^2.1.1" - debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -3045,7 +3205,28 @@ debug@^3.1.0, debug@^3.2.6: dependencies: ms "^2.1.1" -decamelize@^1.0.0, decamelize@^1.2.0: +debug@^4.0.0, debug@^4.0.1, debug@^4.1.1: + version "4.2.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" + integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== + dependencies: + ms "2.1.2" + +debug@^4.1.0: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== + dependencies: + ms "2.1.2" + +debug@~4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" + integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + dependencies: + ms "^2.1.1" + +decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= @@ -3176,18 +3357,9 @@ detect-libc@^1.0.2: resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= -diagnostics@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a" - integrity sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ== - dependencies: - colorspace "1.1.x" - enabled "1.0.x" - kuler "1.0.x" - "diff-match-patch@git+https://github.com/hackmdio/diff-match-patch.git": version "1.1.1" - resolved "git+https://github.com/hackmdio/diff-match-patch.git#5b73bb82454a81ecdbdb81afb4bea4c36132fbaa" + resolved "git+https://github.com/hackmdio/diff-match-patch.git#c2f8fb9d69aa9490b764850aa86ba442c93ccf78" diff@3.5.0: version "3.5.0" @@ -3203,17 +3375,12 @@ diffie-hellman@^5.0.0: miller-rabin "^4.0.0" randombytes "^2.0.0" -dir-glob@^2.0.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4" - integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw== +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== dependencies: - path-type "^3.0.0" - -dns-prefetch-control@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/dns-prefetch-control/-/dns-prefetch-control-0.2.0.tgz#73988161841f3dcc81f47686d539a2c702c88624" - integrity sha512-hvSnros73+qyZXhHFjx2CMLwoj3Fe7eR9EJsFsqmcI1bB2OBWL/+0YzaEaKssCHnj/6crawNnUyw74Gm2EKe+Q== + path-type "^4.0.0" doctrine@1.5.0: version "1.5.0" @@ -3264,9 +3431,9 @@ domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== domelementtype@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d" - integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ== + version "2.0.2" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz#f3b6e549201e46f588b59463dd77187131fe6971" + integrity sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA== domexception@^1.0.1: version "1.0.1" @@ -3303,10 +3470,18 @@ dont-sniff-mimetype@1.1.0: resolved "https://registry.yarnpkg.com/dont-sniff-mimetype/-/dont-sniff-mimetype-1.1.0.tgz#c7d0427f8bcb095762751252af59d148b0a623b2" integrity sha512-ZjI4zqTaxveH2/tTlzS1wFp+7ncxNZaIEWYg3lzZRHkKf5zPT/MnEG6WL0BhHMJUabkh8GeU5NL5j+rEUCb7Ug== +dot-case@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz#21d3b52efaaba2ea5fda875bb1aa8124521cf4aa" + integrity sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA== + dependencies: + no-case "^3.0.3" + tslib "^1.10.0" + dot-prop@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb" - integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A== + version "5.3.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== dependencies: is-obj "^2.0.0" @@ -3322,11 +3497,6 @@ dtrace-provider@~0.8: dependencies: nan "^2.14.0" -duplexer@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" - integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= - duplexify@^3.4.2, duplexify@^3.6.0: version "3.7.1" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" @@ -3372,15 +3542,15 @@ ejs@^2.5.5: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== -electron-to-chromium@^1.3.349, electron-to-chromium@^1.3.47: - version "1.3.352" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.352.tgz#f0fc1e561104dbfba55cb3d45cad3626dc75d7e9" - integrity sha512-dL/RyoueFG3UMhG0q3weAQvr+Tbqx/axAnOXYIIOsoYnV+2i+nRvX2S6msEo2+JARbBP8MFkkSYQ8AoY9Bh4Og== +electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.591: + version "1.3.596" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.596.tgz#c7ed98512c7ff36ddcbfed9e54e6355335c35257" + integrity sha512-nLO2Wd2yU42eSoNJVQKNf89CcEGqeFZd++QsnN2XIgje1s/19AgctfjLIbPORlvcCO8sYjLwX4iUgDdusOY8Sg== -elliptic@^6.0.0: - version "6.5.2" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762" - integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw== +elliptic@^6.5.3: + version "6.5.3" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6" + integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw== dependencies: bn.js "^4.4.0" brorand "^1.0.1" @@ -3395,88 +3565,82 @@ emoji-regex@^7.0.1: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== -emojify.js@~1.1.0: +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +emojify.js@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/emojify.js/-/emojify.js-1.1.0.tgz#079fff223307c9007f570785e8e4935d5c398beb" integrity sha1-B5//IjMHyQB/VweF6OSTXVw5i+s= -emojis-list@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" - integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= +emojis-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== -enabled@1.0.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93" - integrity sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M= - dependencies: - env-variable "0.0.x" +enabled@2.0.x: + version "2.0.0" + resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" + integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -end-of-stream@^1.0.0, end-of-stream@^1.1.0: +end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== dependencies: once "^1.4.0" -engine.io-client@~3.2.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36" - integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw== +engine.io-client@~3.4.0: + version "3.4.4" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.4.tgz#77d8003f502b0782dd792b073a4d2cf7ca5ab967" + integrity sha512-iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ== dependencies: - component-emitter "1.2.1" + component-emitter "~1.3.0" component-inherit "0.0.3" debug "~3.1.0" - engine.io-parser "~2.1.1" + engine.io-parser "~2.2.0" has-cors "1.1.0" indexof "0.0.1" - parseqs "0.0.5" - parseuri "0.0.5" - ws "~3.3.1" + parseqs "0.0.6" + parseuri "0.0.6" + ws "~6.1.0" xmlhttprequest-ssl "~1.5.4" yeast "0.1.2" -engine.io-parser@~2.1.0, engine.io-parser@~2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz#757ab970fbf2dfb32c7b74b033216d5739ef79a6" - integrity sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA== +engine.io-parser@~2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7" + integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg== dependencies: after "0.8.2" arraybuffer.slice "~0.0.7" - base64-arraybuffer "0.1.5" + base64-arraybuffer "0.1.4" blob "0.0.5" has-binary2 "~1.0.2" -engine.io@~3.2.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.1.tgz#b60281c35484a70ee0351ea0ebff83ec8c9522a2" - integrity sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w== +engine.io@~3.4.0: + version "3.4.2" + resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.2.tgz#8fc84ee00388e3e228645e0a7d3dfaeed5bd122c" + integrity sha512-b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg== dependencies: accepts "~1.3.4" - base64id "1.0.0" + base64id "2.0.0" cookie "0.3.1" - debug "~3.1.0" - engine.io-parser "~2.1.0" - ws "~3.3.1" - -enhanced-resolve@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f" - integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng== - dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.4.0" - tapable "^1.0.0" + debug "~4.1.0" + engine.io-parser "~2.2.0" + ws "^7.1.2" -enhanced-resolve@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66" - integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA== +enhanced-resolve@^4.1.1, enhanced-resolve@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126" + integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ== dependencies: graceful-fs "^4.1.2" memory-fs "^0.5.0" @@ -3487,15 +3651,22 @@ entities@^1.1.1, entities@~1.1.1: resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== -entities@^2.0.0, entities@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4" - integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw== +entities@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" + integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== -env-variable@0.0.x: - version "0.0.6" - resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.6.tgz#74ab20b3786c545b62b4a4813ab8cf22726c9808" - integrity sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg== +entities@~2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f" + integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ== + +entity-decode@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/entity-decode/-/entity-decode-2.0.2.tgz#e4f807e52c3294246e9347d1f2b02b07fd5f92e7" + integrity sha512-5CCY/3ci4MC1m2jlumNjWd7VBFt4VfFnmSqSNmVcXq4gxM3Vmarxtt+SvmBnzwLS669MWdVuXboNVj1qN2esVg== + dependencies: + he "^1.1.1" errno@^0.1.1, errno@^0.1.3, errno@~0.1.7: version "0.1.7" @@ -3512,21 +3683,39 @@ error-ex@^1.2.0, error-ex@^1.3.1: is-arrayish "^0.2.1" es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: - version "1.17.4" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184" - integrity sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ== + version "1.17.7" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c" + integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g== dependencies: es-to-primitive "^1.2.1" function-bind "^1.1.1" has "^1.0.3" has-symbols "^1.0.1" - is-callable "^1.1.5" - is-regex "^1.0.5" - object-inspect "^1.7.0" + is-callable "^1.2.2" + is-regex "^1.1.1" + object-inspect "^1.8.0" object-keys "^1.1.1" - object.assign "^4.1.0" - string.prototype.trimleft "^2.1.1" - string.prototype.trimright "^2.1.1" + object.assign "^4.1.1" + string.prototype.trimend "^1.0.1" + string.prototype.trimstart "^1.0.1" + +es-abstract@^1.18.0-next.1: + version "1.18.0-next.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68" + integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.2.2" + is-negative-zero "^2.0.0" + is-regex "^1.1.1" + object-inspect "^1.8.0" + object-keys "^1.1.1" + object.assign "^4.1.1" + string.prototype.trimend "^1.0.1" + string.prototype.trimstart "^1.0.1" es-to-primitive@^1.2.1: version "1.2.1" @@ -3560,11 +3749,6 @@ es6-iterator@^2.0.3, es6-iterator@~2.0.3: es5-ext "^0.10.35" es6-symbol "^3.1.1" -es6-promise@^4.0.3: - version "4.2.8" - resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" - integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== - es6-symbol@^3.1.1, es6-symbol@~3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18" @@ -3583,6 +3767,11 @@ es6-weak-map@^2.0.2: es6-iterator "^2.0.3" es6-symbol "^3.1.1" +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + escape-html@^1.0.3, escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -3593,15 +3782,10 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1 resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -escaper@^2.5.3: - version "2.5.3" - resolved "https://registry.yarnpkg.com/escaper/-/escaper-2.5.3.tgz#8b8fe90ba364054151ab7eff18b4ce43b1e13ab5" - integrity sha512-QGb9sFxBVpbzMggrKTX0ry1oiI4CSDAl9vIL702hzl1jGW8VZs7qfqTRX7WDOjoNDoEVGcEtu1ZOQgReSfT2kQ== - escodegen@^1.9.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457" - integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ== + version "1.14.3" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" + integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== dependencies: esprima "^4.0.1" estraverse "^4.2.0" @@ -3610,23 +3794,23 @@ escodegen@^1.9.1: optionalDependencies: source-map "~0.6.1" -eslint-config-standard@^12.0.0: +eslint-config-standard@12.0.0: version "12.0.0" resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz#638b4c65db0bd5a41319f96bba1f15ddad2107d9" integrity sha512-COUz8FnXhqFitYj4DTqHzidjIL/t4mumGZto5c7DrBpvWoie+Sn3P4sLEzUGeYhRElWuFEf8K1S1EfvD1vixCQ== -eslint-import-resolver-node@^0.3.2: - version "0.3.3" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404" - integrity sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg== +eslint-import-resolver-node@^0.3.4: + version "0.3.4" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" + integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== dependencies: debug "^2.6.9" resolve "^1.13.1" -eslint-module-utils@^2.4.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz#7878f7504824e1b857dd2505b59a8e5eda26a708" - integrity sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q== +eslint-module-utils@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6" + integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA== dependencies: debug "^2.6.9" pkg-dir "^2.0.0" @@ -3639,25 +3823,26 @@ eslint-plugin-es@^1.3.1: eslint-utils "^1.4.2" regexpp "^2.0.1" -eslint-plugin-import@^2.14.0: - version "2.20.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3" - integrity sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw== +eslint-plugin-import@2.22.1: + version "2.22.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702" + integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw== dependencies: - array-includes "^3.0.3" - array.prototype.flat "^1.2.1" + array-includes "^3.1.1" + array.prototype.flat "^1.2.3" contains-path "^0.1.0" debug "^2.6.9" doctrine "1.5.0" - eslint-import-resolver-node "^0.3.2" - eslint-module-utils "^2.4.1" + eslint-import-resolver-node "^0.3.4" + eslint-module-utils "^2.6.0" has "^1.0.3" minimatch "^3.0.4" - object.values "^1.1.0" + object.values "^1.1.1" read-pkg-up "^2.0.0" - resolve "^1.12.0" + resolve "^1.17.0" + tsconfig-paths "^3.9.0" -eslint-plugin-node@^8.0.0: +eslint-plugin-node@8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-8.0.1.tgz#55ae3560022863d141fa7a11799532340a685964" integrity sha512-ZjOjbjEi6jd82rIpFSgagv4CHWzG9xsQAVp1ZPlhRnnYxcTgENUVBvhYmkQ7GvT1QFijUSo69RaiOJKhMu6i8w== @@ -3669,15 +3854,15 @@ eslint-plugin-node@^8.0.0: resolve "^1.8.1" semver "^5.5.0" -eslint-plugin-promise@^4.0.1: +eslint-plugin-promise@4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a" integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw== -eslint-plugin-standard@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz#ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4" - integrity sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ== +eslint-plugin-standard@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.1.0.tgz#0c3bf3a67e853f8bbbc580fb4945fbf16f41b7c5" + integrity sha512-ZL7+QRixjTR6/528YNGyDotyffm5OQst/sGxKDwGb9Uqs4In5Egi4+jbobhqJoyoCM6/7v/1A5fhQ7ScMtDjaQ== eslint-scope@^4.0.3: version "4.0.3" @@ -3695,11 +3880,11 @@ eslint-utils@^1.3.1, eslint-utils@^1.4.2: eslint-visitor-keys "^1.1.0" eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" - integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== + version "1.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint@^5.9.0: +eslint@5.16.0: version "5.16.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea" integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg== @@ -3750,34 +3935,34 @@ espree@^5.0.1: acorn-jsx "^5.0.0" eslint-visitor-keys "^1.0.0" -esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0: +esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== esquery@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz#c5c0b66f383e7656404f86b31334d72524eddb48" - integrity sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q== + version "1.3.1" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" + integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== dependencies: - estraverse "^4.0.0" + estraverse "^5.1.0" esrecurse@^4.1.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf" - integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ== + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== dependencies: - estraverse "^4.1.0" + estraverse "^5.2.0" -estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.1.1, estraverse@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== -estree-walker@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362" - integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w== +estraverse@^5.1.0, estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== esutils@^2.0.2: version "2.0.3" @@ -3794,10 +3979,10 @@ eve-raphael@0.5.0: resolved "https://registry.yarnpkg.com/eve-raphael/-/eve-raphael-0.5.0.tgz#17c754b792beef3fa6684d79cf5a47c63c4cda30" integrity sha1-F8dUt5K+7z+maE15z1pHxjxM2jA= -eve@~0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/eve/-/eve-0.4.2.tgz#7eea0afc0e4efb7c9365615315a3576833ead2ae" - integrity sha1-fuoK/A5O+3yTZWFTFaNXaDPq0q4= +eve@~0.5.1: + version "0.5.4" + resolved "https://registry.yarnpkg.com/eve/-/eve-0.5.4.tgz#67d080b9725291d7e389e34c26860dd97f1debaa" + integrity sha1-Z9CAuXJSkdfjieNMJoYN2X8d66o= event-emitter@^0.3.5: version "0.3.5" @@ -3813,9 +3998,9 @@ events@1.1.1: integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= events@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59" - integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg== + version "3.2.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379" + integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg== evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: version "1.0.3" @@ -3825,18 +4010,10 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" -execa@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" - integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== - dependencies: - cross-spawn "^6.0.0" - get-stream "^4.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" +exit-on-epipe@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692" + integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw== expand-brackets@^0.1.4: version "0.1.5" @@ -3872,20 +4049,15 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -expect-ct@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/expect-ct/-/expect-ct-0.2.0.tgz#3a54741b6ed34cc7a93305c605f63cd268a54a62" - integrity sha512-6SK3MG/Bbhm8MsgyJAylg+ucIOU71/FzyFalcfu5nY19dH8y/z0tBJU0wrNBXD4B27EoQtqPF/9wqH0iYAd04g== - -expose-loader@^0.7.5: +expose-loader@0.7.5: version "0.7.5" resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-0.7.5.tgz#e29ea2d9aeeed3254a3faa1b35f502db9f9c3f6f" integrity sha512-iPowgKUZkTPX5PznYsmifVj9Bob0w2wTHVkt/eYNPSzyebkUgIedmskf/kcfEIWpiWjg3JRjnW+a17XypySMuw== express-session@^1.14.2: - version "1.17.0" - resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.17.0.tgz#9b50dbb5e8a03c3537368138f072736150b7f9b3" - integrity sha512-t4oX2z7uoSqATbMfsxWMbNjAL0T5zpvcJCk3Z9wnPPN7ibddhnmDZXHfEcoBMG2ojKXZoCyPMc5FbtK+G7SoDg== + version "1.17.1" + resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.17.1.tgz#36ecbc7034566d38c8509885c044d461c11bf357" + integrity sha512-UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q== dependencies: cookie "0.4.0" cookie-signature "1.0.6" @@ -3959,7 +4131,7 @@ extend@3.0.0: resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4" integrity sha1-WkdDU7nzNT3dgXbf03uRyDpG8dQ= -extend@^3.0.2, extend@~3.0.2: +extend@^3.0.0, extend@^3.0.2, extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== @@ -3994,16 +4166,6 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -extract-zip@^1.6.5: - version "1.6.7" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9" - integrity sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k= - dependencies: - concat-stream "1.6.2" - debug "2.6.9" - mkdirp "0.5.1" - yauzl "2.4.1" - extsprintf@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.2.0.tgz#5ad946c22f5b32ba7f8cd7426711c6e8a3fc2529" @@ -4020,9 +4182,21 @@ extsprintf@^1.2.0: integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= fast-deep-equal@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" - integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA== + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-glob@^3.1.1, fast-glob@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3" + integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.0" + merge2 "^1.3.0" + micromatch "^4.0.2" + picomatch "^2.2.1" fast-json-stable-stringify@^2.0.0: version "2.1.0" @@ -4039,27 +4213,34 @@ fast-safe-stringify@^2.0.4: resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743" integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== -fd-slicer@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" - integrity sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU= +fastq@^1.6.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.9.0.tgz#e16a72f338eaca48e91b5c23593bcc2ef66b7947" + integrity sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w== + dependencies: + reusify "^1.0.4" + +fault@^1.0.0, fault@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.4.tgz#eafcfc0a6d214fc94601e170df29954a4f842f13" + integrity sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA== dependencies: - pend "~1.2.0" + format "^0.2.0" feature-policy@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/feature-policy/-/feature-policy-0.3.0.tgz#7430e8e54a40da01156ca30aaec1a381ce536069" integrity sha512-ZtijOTFN7TzCujt1fnNhfWPFPSHeZkesff9AXZj+UEjYBynWNUIYpC87Ve4wHzyexQsImicLu7WsC2LHq7/xrQ== -fecha@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd" - integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg== +fecha@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.0.tgz#3ffb6395453e3f3efff850404f0a59b6747f5f41" + integrity sha512-aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg== figgy-pudding@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790" - integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w== + version "3.5.2" + resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" + integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== figures@^2.0.0: version "2.0.0" @@ -4068,6 +4249,13 @@ figures@^2.0.0: dependencies: escape-string-regexp "^1.0.5" +figures@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" + integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== + dependencies: + escape-string-regexp "^1.0.5" + file-entry-cache@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" @@ -4075,7 +4263,7 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" -file-loader@^4.3.0: +file-loader@4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz#780f040f729b3d18019f20605f723e844b8a58af" integrity sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA== @@ -4088,6 +4276,16 @@ file-saver@^1.3.3: resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8" integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg== +file-type@^16.1.0: + version "16.1.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.1.0.tgz#1c8a4458b2103e07d2b49ae7f76384abafe86529" + integrity sha512-G4Klqf6tuprtG0pC4r9kni4Wv8XhAAsfHphVqsQGA+YiOlPAO40BZduDqKfv0RFsu9q9ZbFObWfwszY/NqhEZw== + dependencies: + readable-web-to-node-stream "^3.0.0" + strtok3 "^6.0.3" + token-types "^2.0.0" + typedarray-to-buffer "^3.1.5" + file-uri-to-path@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" @@ -4119,6 +4317,13 @@ fill-range@^4.0.0: repeat-string "^1.6.1" to-regex-range "^2.1.0" +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + finalhandler@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" @@ -4150,6 +4355,15 @@ find-cache-dir@^2.1.0: make-dir "^2.0.0" pkg-dir "^3.0.0" +find-cache-dir@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" + integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== + dependencies: + commondir "^1.0.1" + make-dir "^3.0.2" + pkg-dir "^4.1.0" + find-up@^2.0.0, find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -4164,7 +4378,15 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" -findup-sync@3.0.0: +find-up@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +findup-sync@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1" integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg== @@ -4184,14 +4406,14 @@ flat-cache@^2.0.1: write "1.0.3" flatted@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08" - integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" + integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== flowchart.js@^1.6.4: - version "1.13.0" - resolved "https://registry.yarnpkg.com/flowchart.js/-/flowchart.js-1.13.0.tgz#fd966270bd310ddefb168d6826c792c5f345372f" - integrity sha512-kr+XrH9WSE40ufAec/hs8kbAvSxFx4Fgyf/mjkJwTxWea5USuQAjZt0j9cZJO4ZayWkin9OkWxH4ovLF/5KZFA== + version "1.15.0" + resolved "https://registry.yarnpkg.com/flowchart.js/-/flowchart.js-1.15.0.tgz#132ba2df14af0a65e67280026ef05a1ffd16569f" + integrity sha512-IyCVUFfHPLPgKLynw3NCkZ7CvKJdc/bAu0aHm+2AxKhtSBCiUC1kcTX1KautC3HOp1A2JS1IOcYxDTmcMkx5nQ== dependencies: raphael "2.3.0" @@ -4203,6 +4425,11 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" +fn.name@1.x.x: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" + integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== + follow-redirects@1.5.10: version "1.5.10" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" @@ -4259,10 +4486,15 @@ form-data@~2.3.2: combined-stream "^1.0.6" mime-types "^2.1.12" +format@^0.2.0: + version "0.2.2" + resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b" + integrity sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs= + formidable@^1.0.17: - version "1.2.1" - resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.1.tgz#70fb7ca0290ee6ff961090415f4b3df3d2082659" - integrity sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg== + version "1.2.2" + resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.2.tgz#bf69aea2972982675f00865342b982986f6b8dd9" + integrity sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q== formidable@~1.0.14: version "1.0.17" @@ -4281,11 +4513,6 @@ fragment-cache@^0.2.1: dependencies: map-cache "^0.2.2" -frameguard@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/frameguard/-/frameguard-3.1.0.tgz#bd1442cca1d67dc346a6751559b6d04502103a22" - integrity sha512-TxgSKM+7LTA6sidjOiSZK9wxY0ffMPY3Wta//MqwmX0nZuEHc8QrkV8Fh3ZhMJeiH+Uyh/tcaarImRy8u77O7g== - fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" @@ -4304,15 +4531,6 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-extra@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950" - integrity sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA= - dependencies: - graceful-fs "^4.1.2" - jsonfile "^2.1.0" - klaw "^1.0.0" - fs-extra@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" @@ -4329,6 +4547,13 @@ fs-minipass@^1.2.5: dependencies: minipass "^2.6.0" +fs-minipass@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" + integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== + dependencies: + minipass "^3.0.0" + fs-readdir-recursive@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" @@ -4350,13 +4575,18 @@ fs.realpath@^1.0.0: integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= fsevents@^1.0.0, fsevents@^1.2.7: - version "1.2.11" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3" - integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw== + version "1.2.13" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" + integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw== dependencies: bindings "^1.5.0" nan "^2.12.1" +fsevents@~2.1.2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e" + integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ== + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -4398,12 +4628,14 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-stream@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== +get-intrinsic@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be" + integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg== dependencies: - pump "^3.0.0" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" @@ -4417,7 +4649,7 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -gist-embed@~2.6.0: +gist-embed@^2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/gist-embed/-/gist-embed-2.6.0.tgz#1ea95703fa1fc2a1255419f6f06c67e9920649ab" integrity sha1-HqlXA/ofwqElVBn28Gxn6ZIGSas= @@ -4445,6 +4677,13 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" +glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" + integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== + dependencies: + is-glob "^4.0.1" + glob@7.1.2: version "7.1.2" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" @@ -4468,7 +4707,7 @@ glob@^6.0.1: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: +glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -4480,13 +4719,6 @@ glob@^7.0.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: once "^1.3.0" path-is-absolute "^1.0.0" -global-modules@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" - integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A== - dependencies: - global-prefix "^3.0.0" - global-modules@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" @@ -4496,6 +4728,13 @@ global-modules@^1.0.0: is-windows "^1.0.1" resolve-dir "^1.0.0" +global-modules@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" + integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A== + dependencies: + global-prefix "^3.0.0" + global-prefix@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" @@ -4526,17 +4765,17 @@ globals@^9.18.0: resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== -globby@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680" - integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA= +globby@^11.0.1: + version "11.0.1" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357" + integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ== dependencies: - array-union "^1.0.1" - dir-glob "^2.0.0" - glob "^7.1.2" - ignore "^3.3.5" - pify "^3.0.0" - slash "^1.0.0" + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.1.1" + ignore "^5.1.4" + merge2 "^1.3.0" + slash "^3.0.0" good-listener@^1.2.2: version "1.2.2" @@ -4545,10 +4784,10 @@ good-listener@^1.2.2: dependencies: delegate "^3.1.2" -graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9: - version "4.2.3" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" - integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.2.0: + version "4.2.4" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" + integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== graphlib@^2.1.7, graphlib@^2.1.8: version "2.1.8" @@ -4563,13 +4802,14 @@ growl@1.10.5: integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== handlebars@^4.5.2: - version "4.7.3" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.3.tgz#8ece2797826886cf8082d1726ff21d2a022550ee" - integrity sha512-SRGwSYuNfx8DwHD/6InAPzD6RgeruWLT+B8e8a7gGs8FWgHzlExpTFMEq2IA6QpAfOClpKHy6+8IqTjeBCu6Kg== + version "4.7.6" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e" + integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA== dependencies: + minimist "^1.2.5" neo-async "^2.6.0" - optimist "^0.6.1" source-map "^0.6.1" + wordwrap "^1.0.0" optionalDependencies: uglify-js "^3.1.4" @@ -4579,11 +4819,11 @@ har-schema@^2.0.0: integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= har-validator@~5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" - integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== + version "5.1.5" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" + integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== dependencies: - ajv "^6.5.5" + ajv "^6.12.3" har-schema "^2.0.0" has-ansi@^2.0.0: @@ -4615,7 +4855,12 @@ has-flag@^3.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= -has-symbols@^1.0.0, has-symbols@^1.0.1: +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-symbols@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== @@ -4664,12 +4909,13 @@ has@^1.0.0, has@^1.0.3: function-bind "^1.1.1" hash-base@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918" - integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg= + version "3.1.0" + resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" + integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA== dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" + inherits "^2.0.4" + readable-stream "^3.6.0" + safe-buffer "^5.2.0" hash.js@^1.0.0, hash.js@^1.0.3: version "1.1.7" @@ -4679,20 +4925,12 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.1" -hasha@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/hasha/-/hasha-2.2.0.tgz#78d7cbfc1e6d66303fe79837365984517b2f6ee1" - integrity sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE= - dependencies: - is-stream "^1.0.1" - pinkie-promise "^2.0.0" - he@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0= -he@^1.2.0: +he@^1.1.1, he@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== @@ -4702,33 +4940,29 @@ helmet-crossdomain@0.4.0: resolved "https://registry.yarnpkg.com/helmet-crossdomain/-/helmet-crossdomain-0.4.0.tgz#5f1fe5a836d0325f1da0a78eaa5fd8429078894e" integrity sha512-AB4DTykRw3HCOxovD1nPR16hllrVImeFp5VBV9/twj66lJ2nU75DP8FPL0/Jp4jj79JhTfG+pFI2MD02kWJ+fA== -helmet-csp@2.9.4: - version "2.9.4" - resolved "https://registry.yarnpkg.com/helmet-csp/-/helmet-csp-2.9.4.tgz#801382bac98f2f88706dc5c89d95c7e31af3a4a9" - integrity sha512-qUgGx8+yk7Xl8XFEGI4MFu1oNmulxhQVTlV8HP8tV3tpfslCs30OZz/9uQqsWPvDISiu/NwrrCowsZBhFADYqg== +helmet-csp@2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/helmet-csp/-/helmet-csp-2.10.0.tgz#685dde1747bc16c5e28ad9d91e229a69f0a85e84" + integrity sha512-Rz953ZNEFk8sT2XvewXkYN0Ho4GEZdjAZy4stjiEQV3eN7GDxg1QKmYggH7otDyIA7uGA6XnUMVSgeJwbR5X+w== dependencies: - bowser "^2.7.0" + bowser "2.9.0" camelize "1.0.0" content-security-policy-builder "2.1.0" dasherize "2.0.0" helmet@^3.21.1: - version "3.21.2" - resolved "https://registry.yarnpkg.com/helmet/-/helmet-3.21.2.tgz#7e2a19d5f6d898a77b5d2858e8e4bb2cda59f19f" - integrity sha512-okUo+MeWgg00cKB8Csblu8EXgcIoDyb5ZS/3u0W4spCimeVuCUvVZ6Vj3O2VJ1Sxpyb8jCDvzu0L1KKT11pkIg== + version "3.23.3" + resolved "https://registry.yarnpkg.com/helmet/-/helmet-3.23.3.tgz#5ba30209c5f73ded4ab65746a3a11bedd4579ab7" + integrity sha512-U3MeYdzPJQhtvqAVBPntVgAvNSOJyagwZwyKsFdyRa8TV3pOKVFljalPOCxbw5Wwf2kncGhmP0qHjyazIdNdSA== dependencies: depd "2.0.0" - dns-prefetch-control "0.2.0" dont-sniff-mimetype "1.1.0" - expect-ct "0.2.0" feature-policy "0.3.0" - frameguard "3.1.0" helmet-crossdomain "0.4.0" - helmet-csp "2.9.4" + helmet-csp "2.10.0" hide-powered-by "1.1.0" hpkp "2.0.0" hsts "2.2.0" - ienoopen "1.1.0" nocache "2.1.0" referrer-policy "1.2.0" x-xss-protection "1.3.0" @@ -4743,15 +4977,10 @@ hide-powered-by@1.1.0: resolved "https://registry.yarnpkg.com/hide-powered-by/-/hide-powered-by-1.1.0.tgz#be3ea9cab4bdb16f8744be873755ca663383fa7a" integrity sha512-Io1zA2yOA1YJslkr+AJlWSf2yWFkKjvkcL9Ni1XSUqnGLr/qRQe2UI3Cn/J9MsJht7yEVCe0SscY1HgVMujbgg== -highlight.js@^9.15.9: - version "9.18.1" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c" - integrity sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg== - -highlight.js@~9.12.0: - version "9.12.0" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e" - integrity sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4= +highlight.js@^9.12.0: + version "9.18.5" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz#d18a359867f378c138d6819edfc2a8acd5f29825" + integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA== hmac-drbg@^1.0.0: version "1.0.1" @@ -4778,9 +5007,9 @@ homedir-polyfill@^1.0.1: parse-passwd "^1.0.0" hosted-git-info@^2.1.4: - version "2.8.5" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c" - integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg== + version "2.8.8" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" + integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== hpkp@2.0.0: version "2.0.0" @@ -4817,17 +5046,17 @@ html-encoding-sniffer@^1.0.2: whatwg-encoding "^1.0.1" html-minifier-terser@^5.0.1: - version "5.0.3" - resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.3.tgz#b33549b57be7f0357be0d0b892995aaed1ed90f8" - integrity sha512-It4No3H1V3Dhd/O0MePFdo0oX/M6u6YZTMw4My/010mT6vxdbqge7+0RoxGAmeSbKok6gjYZoP0p4rpZ2+J2yw== + version "5.1.1" + resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054" + integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg== dependencies: - camel-case "^3.0.0" - clean-css "^4.2.1" - commander "^4.0.0" + camel-case "^4.1.1" + clean-css "^4.2.3" + commander "^4.1.1" he "^1.2.0" - param-case "^2.1.1" + param-case "^3.0.3" relateurl "^0.2.7" - terser "^4.3.9" + terser "^4.6.3" html-minifier@^4.0.0: version "4.0.0" @@ -4842,11 +5071,14 @@ html-minifier@^4.0.0: relateurl "^0.2.7" uglify-js "^3.5.1" -html-webpack-plugin@^4.0.0-beta.11: - version "4.0.0-beta.11" - resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.11.tgz#3059a69144b5aecef97708196ca32f9e68677715" - integrity sha512-4Xzepf0qWxf8CGg7/WQM5qBB2Lc/NFI7MhU59eUDTkuQp3skZczH4UA1d6oQyDEIoMDgERVhRyTdtUPZ5s5HBg== +html-webpack-plugin@4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.0.tgz#625097650886b97ea5dae331c320e3238f6c121c" + integrity sha512-MouoXEYSjTzCrjIxWwg8gxL5fE2X2WZJLmBYXlaJhQUH5K/b5OrqmV7T4dB7iu0xkmJ6JlUuV6fFVtnqbPopZw== dependencies: + "@types/html-minifier-terser" "^5.0.0" + "@types/tapable" "^1.0.5" + "@types/webpack" "^4.41.8" html-minifier-terser "^5.0.1" loader-utils "^1.2.3" lodash "^4.17.15" @@ -4902,16 +5134,16 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -i18n@^0.8.3: - version "0.8.5" - resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.8.5.tgz#3ae2db28fa1670e3f5ba30d3e505958b0b62e7ec" - integrity sha512-6UgLbhJGgn4XFeuZc/dDdrrri0ij24EK4hxv4Pbi5hloYAZ1B2+0eQchEryBFezLKYOHhVGV/5+H4i0oxng94w== +i18n@^0.13.0: + version "0.13.2" + resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.13.2.tgz#3886678fe7cbbed45bac2ce53b8144c788a1c1b5" + integrity sha512-PB65bHhQESMBIl/xVNChEAzoxZ5W6FrZ1H9Ma/YcPeSfE7VS9b0sqwBPusa0CfzSKUPSl+uMhRIgyv3jkE7XNw== dependencies: - debug "*" - make-plural "^6.0.1" + debug "^4.1.1" + make-plural "^6.2.2" math-interval-parser "^2.0.1" messageformat "^2.3.0" - mustache "*" + mustache "^4.0.1" sprintf-js "^1.1.2" iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: @@ -4921,13 +5153,20 @@ iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@^0.5.0, iconv-lite@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.1.tgz#b2425d3c7b18f7219f2ca663d103bddb91718d64" - integrity sha512-ONHr16SQvKZNSqjQT9gy5z24Jw+uqfO02/ngBSBoqChZ+W8qXX7GPRa1RoUnzGADw8K63R1BXUMzarCVQBpY8Q== +iconv-lite@^0.5.0: + version "0.5.2" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.2.tgz#af6d628dccfb463b7364d97f715e4b74b8c8c2b8" + integrity sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag== dependencies: safer-buffer ">= 2.1.2 < 3" +iconv-lite@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01" + integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + icss-utils@^4.0.0, icss-utils@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" @@ -4935,15 +5174,15 @@ icss-utils@^4.0.0, icss-utils@^4.1.1: dependencies: postcss "^7.0.14" -ieee754@1.1.13, ieee754@^1.1.4: +ieee754@1.1.13: version "1.1.13" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== -ienoopen@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/ienoopen/-/ienoopen-1.1.0.tgz#411e5d530c982287dbdc3bb31e7a9c9e32630974" - integrity sha512-MFs36e/ca6ohEKtinTJ5VvAJ6oDRAYFdYXweUnGY9L9vcoqFOU4n2ZhmJ0C4z/cwGZ3YIQRSB3XZ1+ghZkY5NQ== +ieee754@^1.1.13, ieee754@^1.1.4: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== iferr@^0.1.5: version "0.1.5" @@ -4957,20 +5196,15 @@ ignore-walk@^3.0.1: dependencies: minimatch "^3.0.4" -ignore@^3.3.5: - version "3.3.10" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" - integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug== - ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.0.2: - version "5.1.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" - integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== +ignore@^5.0.0, ignore@^5.0.2, ignore@^5.1.4: + version "5.1.8" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" + integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== image-size@~0.5.0: version "0.5.5" @@ -4978,8 +5212,8 @@ image-size@~0.5.0: integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w= "imgur@git+https://github.com/hackmdio/node-imgur.git": - version "0.3.1" - resolved "git+https://github.com/hackmdio/node-imgur.git#4fe9cfa3893505c34c49067483d85d3ad4376cd6" + version "0.5.0" + resolved "git+https://github.com/hackmdio/node-imgur.git#de0a7a1f1eb2cb6628385fedb990ad396a190573" dependencies: commander "^2.13.0" glob "^7.1.2" @@ -4995,14 +5229,14 @@ import-fresh@^2.0.0: resolve-from "^3.0.0" import-fresh@^3.0.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" - integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== + version "3.2.2" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e" + integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw== dependencies: parent-module "^1.0.0" resolve-from "^4.0.0" -import-local@2.0.0: +import-local@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ== @@ -5010,7 +5244,7 @@ import-local@2.0.0: pkg-dir "^3.0.0" resolve-cwd "^2.0.0" -imports-loader@^0.8.0: +imports-loader@0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-0.8.0.tgz#030ea51b8ca05977c40a3abfd9b4088fe0be9a69" integrity sha512-kXWL7Scp8KQ4552ZcdVTeaQCZSLW+e6nJfp3cwUMB673T7Hr98Xjx5JK+ql7ADlJUvj1JS5O01RLbKoutN5QDQ== @@ -5023,6 +5257,11 @@ imurmurhash@^0.1.4: resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + indexes-of@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" @@ -5033,7 +5272,7 @@ indexof@0.0.1: resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= -infer-owner@^1.0.3: +infer-owner@^1.0.3, infer-owner@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== @@ -5051,7 +5290,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -5090,10 +5329,10 @@ inquirer@^6.2.2: strip-ansi "^5.1.0" through "^2.3.6" -interpret@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" - integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== +interpret@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== invariant@^2.2.2: version "2.2.4" @@ -5102,20 +5341,15 @@ invariant@^2.2.2: dependencies: loose-envify "^1.0.0" -invert-kv@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" - integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA== - -ionicons@~2.0.1: +ionicons@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-2.0.1.tgz#ca398113293ea870244f538f0aabbd4b5b209a3e" integrity sha1-yjmBEyk+qHAkT1OPCqu9S1sgmj4= -ipaddr.js@1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65" - integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA== +ipaddr.js@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== is-absolute-url@^2.0.0: version "2.1.0" @@ -5136,6 +5370,24 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" +is-alphabetical@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d" + integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg== + +is-alphanumeric@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz#4a9cef71daf4c001c1d81d63d140cf53fd6889f4" + integrity sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ= + +is-alphanumerical@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf" + integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A== + dependencies: + is-alphabetical "^1.0.0" + is-decimal "^1.0.0" + is-arguments@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3" @@ -5158,6 +5410,13 @@ is-binary-path@^1.0.0: dependencies: binary-extensions "^1.0.0" +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + is-bluebird@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-bluebird/-/is-bluebird-1.0.2.tgz#096439060f4aa411abee19143a84d6a55346d6e2" @@ -5168,10 +5427,15 @@ is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-callable@^1.1.4, is-callable@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab" - integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q== +is-buffer@^2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" + integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== + +is-callable@^1.1.4, is-callable@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" + integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA== is-color-stop@^1.0.0: version "1.1.0" @@ -5185,6 +5449,13 @@ is-color-stop@^1.0.0: rgb-regex "^1.0.1" rgba-regex "^1.0.0" +is-core-module@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" + integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== + dependencies: + has "^1.0.3" + is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" @@ -5204,6 +5475,11 @@ is-date-object@^1.0.1: resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== +is-decimal@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" + integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw== + is-descriptor@^0.1.0: version "0.1.6" resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" @@ -5232,6 +5508,11 @@ is-dotfile@^1.0.0: resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE= +is-empty@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/is-empty/-/is-empty-1.2.0.tgz#de9bb5b278738a05a0b09a57e1fb4d4a341a9f6b" + integrity sha1-3pu1snhzigWgsJpX4ftNSjQan2s= + is-equal-shallow@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" @@ -5278,6 +5559,11 @@ is-fullwidth-code-point@^2.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + is-glob@^2.0.0, is-glob@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" @@ -5292,13 +5578,23 @@ is-glob@^3.1.0: dependencies: is-extglob "^2.1.0" -is-glob@^4.0.0, is-glob@^4.0.1: +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== dependencies: is-extglob "^2.1.1" +is-hexadecimal@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" + integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw== + +is-negative-zero@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461" + integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE= + is-number@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" @@ -5318,6 +5614,11 @@ is-number@^4.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ== +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + is-obj@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" @@ -5328,6 +5629,11 @@ is-plain-obj@^1.0.0: resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= +is-plain-obj@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" + integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== + is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" @@ -5345,37 +5651,32 @@ is-primitive@^2.0.0: resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU= -is-promise@^2.1, is-promise@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" - integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= +is-promise@^2.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" + integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== is-property@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ= -is-regex@^1.0.4, is-regex@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" - integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ== +is-regex@^1.0.4, is-regex@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" + integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== dependencies: - has "^1.0.3" - -is-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" - integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= + has-symbols "^1.0.1" is-resolvable@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== -is-stream@^1.0.1, is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= +is-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" + integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== is-string@^1.0.5: version "1.0.5" @@ -5396,16 +5697,31 @@ is-symbol@^1.0.2: dependencies: has-symbols "^1.0.1" -is-typedarray@~1.0.0: +is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= +is-what@^3.7.1: + version "3.12.0" + resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.12.0.tgz#f4405ce4bd6dd420d3ced51a026fb90e03705e55" + integrity sha512-2ilQz5/f/o9V7WRWJQmpFYNmQFZ9iM+OXRonZKcYgTkCzjb949Vi4h282PD1UfmgHk666rcWonbRJ++KI41VGw== + +is-whitespace-character@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7" + integrity sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w== + is-windows@^1.0.1, is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== +is-word-character@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230" + integrity sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA== + is-wsl@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" @@ -5463,35 +5779,35 @@ jquery-ui@^1.12.1: resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51" integrity sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE= -jquery@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" - integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw== +jquery@^3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5" + integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg== js-beautify@^1.8.8: - version "1.10.3" - resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.3.tgz#c73fa10cf69d3dfa52d8ed624f23c64c0a6a94c1" - integrity sha512-wfk/IAWobz1TfApSdivH5PJ0miIHgDoYb1ugSqHcODPmaYu46rYe5FVuIEkhjg8IQiv6rDNPyhsqbsohI/C2vQ== + version "1.13.0" + resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.13.0.tgz#a056d5d3acfd4918549aae3ab039f9f3c51eebb2" + integrity sha512-/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA== dependencies: config-chain "^1.1.12" editorconfig "^0.15.3" glob "^7.1.3" - mkdirp "~0.5.1" - nopt "~4.0.1" + mkdirp "^1.0.4" + nopt "^5.0.0" js-cookie@^2.1.3: version "2.2.1" resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== -"js-sequence-diagrams@git+https://github.com/codimd/js-sequence-diagrams.git": +"js-sequence-diagrams@git+https://github.com/hedgedoc/js-sequence-diagrams.git": version "2.0.1" - resolved "git+https://github.com/codimd/js-sequence-diagrams.git#b9afa038521e5dadf9b97624a3c7db21890be669" + resolved "git+https://github.com/hedgedoc/js-sequence-diagrams.git#bda0e49b6c2754f3c7158b1dfb9ccf26efc24b39" dependencies: lodash "4.17.x" - raphael "2.2.x" - snapsvg "0.4.x" - underscore "1.8.x" + raphael "2.3.x" + snapsvg "0.5.x" + underscore "1.11.x" webfontloader "~1.6.x" "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: @@ -5504,18 +5820,26 @@ js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@~3.13.1: - version "3.13.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" - integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== +js-yaml@^3.13.0, js-yaml@^3.6.1: + version "3.14.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482" + integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +js-yaml@^3.13.1, js-yaml@~3.14.0: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== dependencies: argparse "^1.0.7" esprima "^4.0.0" jsbi@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-3.1.1.tgz#8ea18b3e08d102c6cc09acaa9a099921d775f4fa" - integrity sha512-+HQESPaV0mRiH614z4JPVPAftcRC2p53x92lySPzUzFwJbJTMpzHz8OYUkcXPN3fOcHUe0NdVcHnCtX/1+eCrA== + version "3.1.4" + resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-3.1.4.tgz#9654dd02207a66a4911b4e4bb74265bc2cbc9dd0" + integrity sha512-52QRRFSsi9impURE8ZUbzAMCLjPm4THO7H2fcuIvaaeFTbSysvkodbQQXIVsNgq/ypDbq6dJiuGKL0vZ/i9hUg== jsbn@~0.1.0: version "0.1.1" @@ -5588,6 +5912,11 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== +json-parse-even-better-errors@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -5625,12 +5954,12 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -jsonfile@^2.1.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" - integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug= - optionalDependencies: - graceful-fs "^4.1.6" +json5@^2.0.0, json5@^2.1.2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" + integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== + dependencies: + minimist "^1.2.5" jsonfile@^4.0.0: version "4.0.0" @@ -5639,7 +5968,7 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" -jsonlint@^1.6.2: +jsonlint@1.6.3: version "1.6.3" resolved "https://registry.yarnpkg.com/jsonlint/-/jsonlint-1.6.3.tgz#cb5e31efc0b78291d0d862fbef05900adf212988" integrity sha512-jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A== @@ -5679,16 +6008,16 @@ jws@3.x.x: jwa "^1.4.1" safe-buffer "^5.0.1" -kew@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b" - integrity sha1-edk9LTM2PW/dKXCzNdkUGtWR15s= - keymaster@^1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/keymaster/-/keymaster-1.6.2.tgz#e1ae54d0ea9488f9f60b66b668f02e9a1946c6eb" integrity sha1-4a5U0OqUiPn2C2a2aPAumhlGxus= +khroma@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/khroma/-/khroma-1.1.0.tgz#cc17723eb719c5245ea66d23dd577d5695452db5" + integrity sha512-aTO+YX22tYOLEQJYFiatAj1lc5QZ+H5sHWFRBWNCiKwc5NWNUJZyeSeiHEPeURJ2a1GEVYcmyMUwGjjLe5ec5A== + kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" @@ -5713,19 +6042,10 @@ kind-of@^6.0.0, kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -klaw@^1.0.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439" - integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk= - optionalDependencies: - graceful-fs "^4.1.9" - -kuler@1.0.x: - version "1.0.1" - resolved "https://registry.yarnpkg.com/kuler/-/kuler-1.0.1.tgz#ef7c784f36c9fb6e16dd3150d152677b2b0228a6" - integrity sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ== - dependencies: - colornames "^1.1.1" +kuler@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" + integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== last-call-webpack-plugin@^3.0.0: version "3.0.0" @@ -5735,11 +6055,6 @@ last-call-webpack-plugin@^3.0.0: lodash "^4.17.5" webpack-sources "^1.1.0" -lazy-cache@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" - integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4= - lazystream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4" @@ -5747,13 +6062,6 @@ lazystream@^1.0.0: dependencies: readable-stream "^2.0.5" -lcid@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" - integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA== - dependencies: - invert-kv "^2.0.0" - ldap-filter@0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/ldap-filter/-/ldap-filter-0.2.2.tgz#f2b842be0b86da3352798505b31ebcae590d77d0" @@ -5761,13 +6069,13 @@ ldap-filter@0.2.2: dependencies: assert-plus "0.1.5" -ldapauth-fork@^4.2.0: - version "4.3.1" - resolved "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-4.3.1.tgz#500c04f339257ac0e189af8752ec5df43982ceac" - integrity sha512-IJUnkEDQg6D45jUKW3FFfMWZhUjZoGkN97WaMXF1cBod0gJq74d+iwRavPqiE3o/KNRgqwFesrdE4Ym4Fc1GIQ== +ldapauth-fork@^4.3.2: + version "4.3.3" + resolved "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-4.3.3.tgz#d62c8f18a5035fd47a572f2ac7aa8c8227b3f4c2" + integrity sha512-x76VpQ5ZqkwAJmqwcD6KIwDiNEbgIGIPGwC/eA17e1dxWhlTx36w0DlLOFwjTuZ2iuaLTsZsUprlVqvSlwc/1Q== dependencies: "@types/ldapjs" "^1.0.0" - "@types/node" "^10.12.12" + "@types/node" "*" bcryptjs "^2.4.0" ldapjs "^1.0.2" lru-cache "^5.1.1" @@ -5794,7 +6102,7 @@ left-pad@^1.3.0: resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA== -less-loader@^5.0.0: +less-loader@5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-5.0.0.tgz#498dde3a6c6c4f887458ee9ed3f086a12ad1b466" integrity sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg== @@ -5803,21 +6111,20 @@ less-loader@^5.0.0: loader-utils "^1.1.0" pify "^4.0.1" -less@^3.10.3: - version "3.11.1" - resolved "https://registry.yarnpkg.com/less/-/less-3.11.1.tgz#c6bf08e39e02404fe6b307a3dfffafdc55bd36e2" - integrity sha512-tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g== +less@3.13.1: + version "3.13.1" + resolved "https://registry.yarnpkg.com/less/-/less-3.13.1.tgz#0ebc91d2a0e9c0c6735b83d496b0ab0583077909" + integrity sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw== dependencies: - clone "^2.1.2" + copy-anything "^2.0.1" tslib "^1.10.0" optionalDependencies: errno "^0.1.1" graceful-fs "^4.1.2" image-size "~0.5.0" + make-dir "^2.1.0" mime "^1.4.1" - mkdirp "^0.5.0" - promise "^7.1.1" - request "^2.83.0" + native-request "^1.0.5" source-map "~0.6.0" levn@^0.3.0, levn@~0.3.0: @@ -5828,6 +6135,20 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" +libnpmconfig@^1.0.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/libnpmconfig/-/libnpmconfig-1.2.1.tgz#c0c2f793a74e67d4825e5039e7a02a0044dfcbc0" + integrity sha512-9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA== + dependencies: + figgy-pudding "^3.5.1" + find-up "^3.0.0" + ini "^1.3.5" + +lines-and-columns@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" + integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + linkify-it@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf" @@ -5852,20 +6173,37 @@ load-json-file@^2.0.0: pify "^2.0.0" strip-bom "^3.0.0" +load-plugin@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/load-plugin/-/load-plugin-3.0.0.tgz#8f3ce57cf4e5111639911012487bc1c2ba3d0e6c" + integrity sha512-od7eKCCZ62ITvFf8nHHrIiYmgOHb4xVNDRDqxBWSaao5FZyyZVX8OmRCbwjDGPrSrgIulwPNyBsWCGnhiDC0oQ== + dependencies: + libnpmconfig "^1.0.0" + resolve-from "^5.0.0" + loader-runner@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== -loader-utils@1.2.3, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7" - integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA== +loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" + integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== dependencies: big.js "^5.2.2" - emojis-list "^2.0.0" + emojis-list "^3.0.0" json5 "^1.0.1" +loader-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" + integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -5882,6 +6220,13 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + lodash.assignin@^4.0.9: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" @@ -5892,17 +6237,22 @@ lodash.bind@^4.1.4: resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35" integrity sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU= -lodash.defaults@^4.0.1: +lodash.defaults@^4.0.1, lodash.defaults@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= +lodash.difference@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c" + integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw= + lodash.filter@^4.4.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4= -lodash.flatten@^4.2.0: +lodash.flatten@^4.2.0, lodash.flatten@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= @@ -5912,6 +6262,11 @@ lodash.foreach@^4.3.0: resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM= +lodash.isplainobject@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= + lodash.map@^4.4.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" @@ -5952,24 +6307,29 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= +lodash.union@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" + integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= + lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@4.17.x, lodash@^4.14.2, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.8.0: - version "4.17.15" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" - integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== +lodash@4.17.x, lodash@^4.14.2, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.4, lodash@^4.17.5: + version "4.17.20" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" + integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== -logform@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.1.2.tgz#957155ebeb67a13164069825ce67ddb5bb2dd360" - integrity sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ== +logform@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz#40f036d19161fc76b68ab50fdc7fe495544492f2" + integrity sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg== dependencies: colors "^1.2.1" fast-safe-stringify "^2.0.4" - fecha "^2.3.3" + fecha "^4.2.0" ms "^2.1.1" triple-beam "^1.3.0" @@ -5978,10 +6338,10 @@ long@^4.0.0: resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== -longest@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" - integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc= +longest-streak@^2.0.1: + version "2.0.4" + resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4" + integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg== loose-envify@^1.0.0: version "1.4.0" @@ -5995,6 +6355,13 @@ lower-case@^1.1.1: resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= +lower-case@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7" + integrity sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ== + dependencies: + tslib "^1.10.0" + lru-cache@^4.1.3, lru-cache@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" @@ -6010,6 +6377,13 @@ lru-cache@^5.1.1: dependencies: yallist "^3.0.2" +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + lru-queue@0.1: version "0.1.0" resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3" @@ -6018,9 +6392,9 @@ lru-queue@0.1: es5-ext "~0.10.2" lutim@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/lutim/-/lutim-1.0.2.tgz#0b1e5a83c0c8d45900beb4eaf551e34f34f8a3e8" - integrity sha512-eIeHBtFIxyef4mW+zgxoUyW59NN/lCRGoK7pDfnmY97asflEwA04met3SqFPEgPgeWgm4iRAMAJWZ3MDQ39ucw== + version "1.0.3" + resolved "https://registry.yarnpkg.com/lutim/-/lutim-1.0.3.tgz#3a29d0f2731eed7097f2d7367defeaa2ae45d820" + integrity sha512-niTn8F4/SyxjXG2a1lXAS/t5Yox9DCOPfVff6Y5tfrBPkK/bnzp2bRIkSNF+X2PRxjfvev0jFmi9J6IX1IkC7A== dependencies: q "^1.5.1" request "^2.88.0" @@ -6029,13 +6403,6 @@ lutim@^1.0.2: version "1.4.4" resolved "git+https://github.com/hackmdio/lz-string.git#efd1f64676264d6d8871b01f4f375fc6ef4f9022" -magic-string@^0.25.3: - version "0.25.6" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.6.tgz#5586387d1242f919c6d223579cc938bf1420795e" - integrity sha512-3a5LOMSGoCTH5rbqobC2HuDNRtE2glHZ8J7pK+QZYppyWA36yuNpsX994rIY2nCuyP7CZYy7lQq/X2jygiZ89g== - dependencies: - sourcemap-codec "^1.4.4" - make-dir@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" @@ -6043,7 +6410,7 @@ make-dir@^1.0.0: dependencies: pify "^3.0.0" -make-dir@^2.0.0: +make-dir@^2.0.0, make-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== @@ -6051,6 +6418,13 @@ make-dir@^2.0.0: pify "^4.0.1" semver "^5.6.0" +make-dir@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + make-plural@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-4.3.0.tgz#f23de08efdb0cac2e0c9ba9f315b0dff6b4c2735" @@ -6058,22 +6432,10 @@ make-plural@^4.3.0: optionalDependencies: minimist "^1.2.0" -make-plural@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-6.0.1.tgz#ed3839fac3f469ebbe505751d48fe3319769edfc" - integrity sha512-h0uBNi4tpDkiWUyYKrJNj8Kif6q3Ba5zp/8jnfPy3pQE+4XcTj6h3eZM5SYVUyDNX9Zk69Isr/dx0I+78aJUaQ== - -mamacro@^0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4" - integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA== - -map-age-cleaner@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" - integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== - dependencies: - p-defer "^1.0.0" +make-plural@^6.2.2: + version "6.2.2" + resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-6.2.2.tgz#beb5fd751355e72660eeb2218bb98eec92853c6c" + integrity sha512-8iTuFioatnTTmb/YJjywkVIHLjcwkFD9Ms0JpxjEm9Mo8eQYkh1z+55dwv4yc1jQ8ftVBxWQbihvZL1DfzGGWA== map-cache@^0.2.2: version "0.2.2" @@ -6088,16 +6450,27 @@ map-visit@^1.0.0: object-visit "^1.0.0" mariadb@^2.1.2: - version "2.2.0" - resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-2.2.0.tgz#077e8c44ded718f2ecebef321c3703fe8d524504" - integrity sha512-YXPF11u4NVgm3FLetJoAbq9Fb0a/RSwNrDHdmAqpqgYErWAOes/IVbOfvWPWZQ0hI88j/81f15AGJZAVuR3bGg== + version "2.5.2" + resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.2.tgz#0046331541589a9c0405507d91d79bcc972b3f5e" + integrity sha512-SfaBl5/LiX2qJNNr7wCQvizVjtWxVm1CUWYKe+y4OMeyYMM6g0GhwX7/BbGtv/O3WthnGrM+Kj1imFnlescO0w== dependencies: "@types/geojson" "^7946.0.7" - "@types/node" ">=8.0.0" + "@types/node" "^14.14.7" denque "^1.4.1" - iconv-lite "^0.5.1" + iconv-lite "^0.6.2" long "^4.0.0" - moment-timezone "^0.5.27" + moment-timezone "^0.5.32" + please-upgrade-node "^3.2.0" + +markdown-escapes@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" + integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg== + +markdown-extensions@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/markdown-extensions/-/markdown-extensions-1.1.1.tgz#fea03b539faeaee9b4ef02a3769b455b189f7fc3" + integrity sha512-WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q== markdown-it-abbr@^1.0.4: version "1.0.4" @@ -6110,9 +6483,9 @@ markdown-it-container@^2.0.0: integrity sha1-ABm0P9Au7+zi8ZYKKJX7qBpARpU= markdown-it-deflist@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/markdown-it-deflist/-/markdown-it-deflist-2.0.3.tgz#5727db04184d3cb2bc6ee4a9641e3a1091d5fd6f" - integrity sha512-/BNZ8ksW42bflm1qQLnRI09oqU2847Z7MVavrR0MORyKLtiUYOMpwtlAfMSZAQU9UCvaUZMpgVAqoS3vpToJxw== + version "2.1.0" + resolved "https://registry.yarnpkg.com/markdown-it-deflist/-/markdown-it-deflist-2.1.0.tgz#50d7a56b9544cd81252f7623bd785e28a8dcef5c" + integrity sha512-3OuqoRUlSxJiuQYu0cWTLHNhhq2xtoSFqsZK8plANg91+RJQU1ziQ6lA2LzmFAEes18uPBsHZpcX6We5l76Nzg== markdown-it-emoji@^1.3.0: version "1.4.0" @@ -6170,25 +6543,17 @@ markdown-it@^10.0.0: mdurl "^1.0.1" uc.micro "^1.0.5" -markdown-pdf@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/markdown-pdf/-/markdown-pdf-10.0.0.tgz#0cf7a32740c2966aa79392a35742749d6ed2a491" - integrity sha512-o3lFfAOTpCgCXEXpNN86RaCVGE1YlxjWuAJ79XevAPoTyCBsl06BWhnFogYedg+JZxPjB3LWsA8JxZiCjsPPLA== +markdown-table@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-2.0.0.tgz#194a90ced26d31fe753d8b9434430214c011865b" + integrity sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A== dependencies: - commander "^3.0.0" - duplexer "^0.1.1" - extend "^3.0.2" - highlight.js "^9.15.9" - phantomjs-prebuilt "^2.1.3" - remarkable "^2.0.0" - stream-from-to "^1.4.2" - through2 "^3.0.1" - tmp "^0.1.0" - -marked@~0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/marked/-/marked-0.8.0.tgz#ec5c0c9b93878dc52dd54be8d0e524097bd81a99" - integrity sha512-MyUe+T/Pw4TZufHkzAfDj6HarCBWia2y27/bhuYkTaiUnfDYFnCP3KUN+9oM7Wi6JA2rymtVYbQu3spE0GCmxQ== + repeat-string "^1.0.0" + +marked@~1.2.0: + version "1.2.7" + resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.7.tgz#6e14b595581d2319cdcf033a24caaf41455a01fb" + integrity sha512-No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA== math-interval-parser@^2.0.1: version "2.0.1" @@ -6200,10 +6565,10 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== -mathjax@~2.7.6: - version "2.7.7" - resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.7.tgz#22ff89550a7b1f5f06a037d13da5ff3c33e11ec4" - integrity sha512-OOl0B2/0tSJAtAZarXnQuLDBLgTNRqiI9VqHTQzPsxf4okT2iIpDrvaklK9x2QEMD1sDj4yRn11Ygci41DxMAQ== +mathjax@^2.7.6: + version "2.7.9" + resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.9.tgz#d6b67955c173e7d719fcb2fc0288662884eb7d3d" + integrity sha512-NOGEDTIM9+MrsqnjPEjVGNx4q0GQxqm61yQwSK+/5S59i26wId5IC5gNu9/bu8+CCVl5p9G2IHcAl/wJa+5+BQ== mattermost@^3.4.0: version "3.4.0" @@ -6229,6 +6594,33 @@ md5.js@^1.3.4: inherits "^2.0.1" safe-buffer "^5.1.2" +mdast-comment-marker@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/mdast-comment-marker/-/mdast-comment-marker-1.1.2.tgz#5ad2e42cfcc41b92a10c1421a98c288d7b447a6d" + integrity sha512-vTFXtmbbF3rgnTh3Zl3irso4LtvwUq/jaDvT2D1JqTGAwaipcS7RpTxzi6KjoRqI9n2yuAhzLDAC8xVTF3XYVQ== + +mdast-util-compact@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz#cabc69a2f43103628326f35b1acf735d55c99490" + integrity sha512-7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA== + dependencies: + unist-util-visit "^2.0.0" + +mdast-util-heading-style@^1.0.2: + version "1.0.6" + resolved "https://registry.yarnpkg.com/mdast-util-heading-style/-/mdast-util-heading-style-1.0.6.tgz#6410418926fd5673d40f519406b35d17da10e3c5" + integrity sha512-8ZuuegRqS0KESgjAGW8zTx4tJ3VNIiIaGFNEzFpRSAQBavVc7AvOo9I4g3crcZBfYisHs4seYh0rAVimO6HyOw== + +mdast-util-to-string@^1.0.2: + version "1.1.0" + resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz#27055500103f51637bd07d01da01eb1967a43527" + integrity sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A== + +mdn-data@2.0.12: + version "2.0.12" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.12.tgz#bbb658d08b38f574bbb88f7b83703defdcc46844" + integrity sha512-ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q== + mdn-data@2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" @@ -6244,15 +6636,6 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -mem@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" - integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w== - dependencies: - map-age-cleaner "^0.1.1" - mimic-fn "^2.0.0" - p-is-promise "^2.0.0" - memoizee@^0.4.14: version "0.4.14" resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.14.tgz#07a00f204699f9a95c2d9e77218271c7cd610d57" @@ -6267,7 +6650,7 @@ memoizee@^0.4.14: next-tick "1" timers-ext "^0.1.5" -memory-fs@^0.4.0, memory-fs@^0.4.1: +memory-fs@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI= @@ -6288,22 +6671,27 @@ merge-descriptors@1.0.1: resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= -mermaid@~8.4.6: - version "8.4.7" - resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.4.7.tgz#1af8f6bece99f022a514471c42b80cabf7706501" - integrity sha512-mj4mefncBd8y921auvsXMN5MbVqzkrXyCUPz1AbVdQ+W6XKO27Oyqnor4ZO2hlqlosJc+Dl273V+SJBmX5PTNw== +merge2@^1.3.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== + +mermaid@^8.5.1: + version "8.8.4" + resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.8.4.tgz#5ea699bcfa1ef848d78b2ce8efb1e0118f30d9f7" + integrity sha512-YPn35uEAIrOcsDPjCiKNXXBdO1Aoazsv2zTZjG4+oXa7+tTVUb5sI81NqaTYa47RnoH9Vl4waLlEEJfB8KM9VA== dependencies: "@braintree/sanitize-url" "^3.1.0" - crypto-random-string "^3.0.1" d3 "^5.7.0" dagre "^0.8.4" dagre-d3 "^0.6.4" + entity-decode "^2.0.2" graphlib "^2.1.7" he "^1.2.0" - lodash "^4.17.11" + khroma "^1.1.0" minify "^4.1.1" moment-mini "^2.22.1" - scope-css "^1.2.1" + stylis "^3.5.2" messageformat-formatters@^2.0.1: version "2.0.1" @@ -6311,9 +6699,9 @@ messageformat-formatters@^2.0.1: integrity sha512-E/lQRXhtHwGuiQjI7qxkLp8AHbMD5r2217XNe/SREbBlSawe0lOqsFb7rflZJmlQFSULNLIqlcjjsCPlB3m3Mg== messageformat-parser@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/messageformat-parser/-/messageformat-parser-4.1.2.tgz#fd34ec39912a14868a1595eaeb742485ab8ab372" - integrity sha512-7dWuifeyldz7vhEuL96Kwq1fhZXBW+TUfbnHN4UCrCxoXQTYjHnR78eI66Gk9LaLLsAvzPNVJBaa66DRfFNaiA== + version "4.1.3" + resolved "https://registry.yarnpkg.com/messageformat-parser/-/messageformat-parser-4.1.3.tgz#b824787f57fcda7d50769f5b63e8d4fda68f5b9e" + integrity sha512-2fU3XDCanRqeOCkn7R5zW5VQHWf+T3hH65SzuqRvjatBK7r4uyFa5mEX+k6F9Bd04LVM5G4/BHBTUJsOdW7uyg== messageformat@^2.3.0: version "2.3.0" @@ -6324,12 +6712,12 @@ messageformat@^2.3.0: messageformat-formatters "^2.0.1" messageformat-parser "^4.1.2" -"meta-marked@git+https://github.com/codimd/meta-marked#semver:^0.4.5": +"meta-marked@git+https://github.com/hedgedoc/meta-marked": version "0.4.5" - resolved "git+https://github.com/codimd/meta-marked#a7b45a287465f79656134ff7142d1d74c8fcacfd" + resolved "git+https://github.com/hedgedoc/meta-marked#4fb5cb5a204969cc91e66eee92c0211188e69a2b" dependencies: - js-yaml "~3.13.1" - marked "~0.8.0" + js-yaml "~3.14.0" + marked "~1.2.0" method-override@^2.3.7: version "2.3.10" @@ -6384,6 +6772,14 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" +micromatch@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" + integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== + dependencies: + braces "^3.0.1" + picomatch "^2.0.5" + miller-rabin@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" @@ -6392,47 +6788,47 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.43.0, "mime-db@>= 1.43.0 < 2": - version "1.43.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" - integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== +mime-db@1.44.0: + version "1.44.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" + integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== + +"mime-db@>= 1.43.0 < 2": + version "1.45.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea" + integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w== mime-types@^2.1.12, mime-types@^2.1.14, mime-types@^2.1.3, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.26" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06" - integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ== + version "2.1.27" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" + integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== dependencies: - mime-db "1.43.0" + mime-db "1.44.0" mime@1.3.4: version "1.3.4" resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" integrity sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM= -mime@1.6.0, mime@^1.2.9, mime@^1.4.1: +mime@1.6.0, mime@^1.4.1: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== mime@^2.4.4: - version "2.4.4" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" - integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== + version "2.4.6" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1" + integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA== mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== -mimic-fn@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -mini-css-extract-plugin@^0.8.0: - version "0.8.2" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.2.tgz#a875e169beb27c88af77dd962771c9eedc3da161" - integrity sha512-a3Y4of27Wz+mqK3qrcd3VhYz6cU0iW5x3Sgvqzbj+XmlrSizmvu8QQMl5oMYJjgHOC4iyt+w7l4umP+dQeW3bw== +mini-css-extract-plugin@0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.12.0.tgz#ddeb74fd6304ca9f99c1db74acc7d5b507705454" + integrity sha512-z6PQCe9rd1XUwZ8gMaEVwwRyZlrYy8Ba1gRjFP5HcV51HkXX+XlwZ+a1iAYTjSYwgNBXoNR7mhx79mDpOn5fdw== dependencies: loader-utils "^1.1.0" normalize-url "1.9.1" @@ -6474,15 +6870,10 @@ minimist@0.0.8: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= -minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= - -minimist@~0.0.1: - version "0.0.10" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" - integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= +minimist@^1.2.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== minio@^6.0.0: version "6.0.0" @@ -6504,6 +6895,27 @@ minio@^6.0.0: xml "^1.0.0" xml2js "^0.4.15" +minipass-collect@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" + integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== + dependencies: + minipass "^3.0.0" + +minipass-flush@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" + integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== + dependencies: + minipass "^3.0.0" + +minipass-pipeline@^1.2.2: + version "1.2.4" + resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" + integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== + dependencies: + minipass "^3.0.0" + minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" @@ -6512,6 +6924,13 @@ minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: safe-buffer "^5.1.2" yallist "^3.0.0" +minipass@^3.0.0, minipass@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" + integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== + dependencies: + yallist "^4.0.0" + minizlib@^1.2.1: version "1.3.3" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" @@ -6519,6 +6938,14 @@ minizlib@^1.2.1: dependencies: minipass "^2.9.0" +minizlib@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" + integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== + dependencies: + minipass "^3.0.0" + yallist "^4.0.0" + mississippi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" @@ -6543,14 +6970,26 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1: +mkdirp@0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= dependencies: minimist "0.0.8" -mocha@^5.2.0: +mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +mkdirp@^1.0.3, mkdirp@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + +mocha@5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6" integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ== @@ -6567,7 +7006,7 @@ mocha@^5.2.0: mkdirp "0.5.1" supports-color "5.4.0" -mock-require@^3.0.3: +mock-require@3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz#ccd544d9eae81dd576b3f219f69ec867318a1946" integrity sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg== @@ -6580,28 +7019,28 @@ moment-mini@^2.22.1: resolved "https://registry.yarnpkg.com/moment-mini/-/moment-mini-2.24.0.tgz#fa68d98f7fe93ae65bf1262f6abb5fb6983d8d18" integrity sha512-9ARkWHBs+6YJIvrIp0Ik5tyTTtP9PoV0Ssu2Ocq5y9v8+NOOpWiRshAp8c4rZVWTOe+157on/5G+zj5pwIQFEQ== -moment-timezone@^0.5.21, moment-timezone@^0.5.27: - version "0.5.27" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.27.tgz#73adec8139b6fe30452e78f210f27b1f346b8877" - integrity sha512-EIKQs7h5sAsjhPCqN6ggx6cEbs94GK050254TIJySD1bzoM5JTYDwAU1IoVOeTOL6Gm27kYJ51/uuvq1kIlrbw== +moment-timezone@^0.5.21, moment-timezone@^0.5.32: + version "0.5.32" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.32.tgz#db7677cc3cc680fd30303ebd90b0da1ca0dfecc2" + integrity sha512-Z8QNyuQHQAmWucp8Knmgei8YNo28aLjJq6Ma+jy1ZSpSk5nyfRT8xgUbSQvD2+2UajISfenndwvFuH3NGS+nvA== dependencies: moment ">= 2.9.0" -"moment@>= 2.9.0", moment@^2.10.6, moment@^2.17.1, moment@^2.24.0: - version "2.24.0" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" - integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== +"moment@>= 2.9.0", moment@^2.17.1, moment@^2.19.3, moment@^2.24.0: + version "2.29.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" + integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== morgan@^1.7.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz#0a8d16734a1d9afbc824b99df87e738e58e2da59" - integrity sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA== + version "1.10.0" + resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7" + integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ== dependencies: - basic-auth "~2.0.0" + basic-auth "~2.0.1" debug "2.6.9" - depd "~1.1.2" + depd "~2.0.0" on-finished "~2.3.0" - on-headers "~1.0.1" + on-headers "~1.0.2" move-concurrently@^1.0.1: version "1.0.1" @@ -6625,15 +7064,15 @@ ms@2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== -ms@^2.1.1: +ms@2.1.2, ms@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -mustache@*: - version "4.0.0" - resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.0.0.tgz#7f02465dbb5b435859d154831c032acdfbbefb31" - integrity sha512-FJgjyX/IVkbXBXYUwH+OYwQKqWpFPLaLVESd70yHjSDunwzV2hZOoTBvPf4KLoxesUzzyfTH6F784Uqd7Wm5yA== +mustache@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.0.1.tgz#d99beb031701ad433338e7ea65e0489416c854a2" + integrity sha512-yL5VE97+OXn4+Er3THSmTdCFCtx5hHWzrolvH+JObZnUYwuaG7XV+Ch4fR2cIrcYI0tFHxS7iyFYl14bW8y2sA== mute-stream@0.0.7: version "0.0.7" @@ -6650,19 +7089,18 @@ mv@~2: rimraf "~2.4.0" mysql2@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.1.0.tgz#55ecfd4353114c148cc4c253192dbbfd000e6642" - integrity sha512-9kGVyi930rG2KaHrz3sHwtc6K+GY9d8wWk1XRSYxQiunvGcn4DwuZxOwmK11ftuhhwrYDwGx9Ta4VBwznJn36A== + version "2.2.5" + resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.2.5.tgz#72624ffb4816f80f96b9c97fedd8c00935f9f340" + integrity sha512-XRqPNxcZTpmFdXbJqb+/CtYVLCx14x1RTeNMD4954L331APu75IC74GDqnZMEt1kwaXy6TySo55rF2F3YJS78g== dependencies: - cardinal "^2.1.1" denque "^1.4.1" generate-function "^2.3.1" - iconv-lite "^0.5.0" + iconv-lite "^0.6.2" long "^4.0.0" - lru-cache "^5.1.1" + lru-cache "^6.0.0" named-placeholders "^1.1.2" seq-queue "^0.0.5" - sqlstring "^2.3.1" + sqlstring "^2.3.2" named-placeholders@^1.1.2: version "1.1.2" @@ -6672,9 +7110,14 @@ named-placeholders@^1.1.2: lru-cache "^4.1.3" nan@^2.12.1, nan@^2.14.0: - version "2.14.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" - integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== + version "2.14.2" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" + integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== + +nanoid@^2.1.0: + version "2.1.11" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280" + integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== nanomatch@^1.2.9: version "1.2.13" @@ -6698,6 +7141,11 @@ native-duplexpair@^1.0.0: resolved "https://registry.yarnpkg.com/native-duplexpair/-/native-duplexpair-1.0.0.tgz#7899078e64bf3c8a3d732601b3d40ff05db58fa0" integrity sha1-eJkHjmS/PIo9cyYBs9QP8F21j6A= +native-request@^1.0.5: + version "1.0.8" + resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb" + integrity sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag== + natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -6709,9 +7157,9 @@ ncp@~2.0.0: integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= needle@^2.2.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz#3342dea100b7160960a450dc8c22160ac712a528" - integrity sha512-DUzITvPVDUy6vczKKYTnWc/pBZ0EnjMJnQ3y+Jo5zfKFimJs7S3HFCxCRZYB9FUZcrzUQr3WsmvZgddMEIZv6w== + version "2.5.2" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.5.2.tgz#cf1a8fce382b5a280108bba90a14993c00e4010a" + integrity sha512-LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ== dependencies: debug "^3.2.6" iconv-lite "^0.4.4" @@ -6723,9 +7171,9 @@ negotiator@0.6.2: integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" - integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== next-tick@1: version "1.1.0" @@ -6749,20 +7197,28 @@ no-case@^2.2.0: dependencies: lower-case "^1.1.1" +no-case@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz#c21b434c1ffe48b39087e86cfb4d2582e9df18f8" + integrity sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw== + dependencies: + lower-case "^2.0.1" + tslib "^1.10.0" + nocache@2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/nocache/-/nocache-2.1.0.tgz#120c9ffec43b5729b1d5de88cd71aa75a0ba491f" integrity sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q== -node-forge@^0.7.0: - version "0.7.6" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac" - integrity sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw== +node-forge@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" + integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== -node-gyp-build@~3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-3.7.0.tgz#daa77a4f547b9aed3e2aac779eaf151afd60ec8d" - integrity sha512-L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w== +node-gyp-build@^4.2.0: + version "4.2.3" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz#ce6277f853835f718829efb47db20f3e4d9c4739" + integrity sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg== node-libs-browser@^2.2.1: version "2.2.1" @@ -6793,22 +7249,6 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-pre-gyp@^0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054" @@ -6825,23 +7265,12 @@ node-pre-gyp@^0.11.0: semver "^5.3.0" tar "^4" -node-releases@^1.1.49: - version "1.1.49" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.49.tgz#67ba5a3fac2319262675ef864ed56798bb33b93e" - integrity sha512-xH8t0LS0disN0mtRCh+eByxFPie+msJUBL/lJDBuap53QGiYPa9joh83K4pCZgWJ+2L4b9h88vCVdXQ60NO2bg== - dependencies: - semver "^6.3.0" - -node-static@0.7.11: - version "0.7.11" - resolved "https://registry.yarnpkg.com/node-static/-/node-static-0.7.11.tgz#60120d349f3cef533e4e820670057eb631882e7f" - integrity sha512-zfWC/gICcqb74D9ndyvxZWaI1jzcoHmf4UTHWQchBNuNMxdBLJMDiUgZ1tjGLEIe/BMhj2DxKD8HOuc2062pDQ== - dependencies: - colors ">=0.6.0" - mime "^1.2.9" - optimist ">=0.3.4" +node-releases@^1.1.66: + version "1.1.66" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.66.tgz#609bd0dc069381015cd982300bae51ab4f1b1814" + integrity sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg== -nomnom@^1.5.x, nomnom@^1.8.1: +nomnom@^1.5.x: version "1.8.1" resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7" integrity sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc= @@ -6849,14 +7278,21 @@ nomnom@^1.5.x, nomnom@^1.8.1: chalk "~0.4.0" underscore "~1.6.0" -nopt@^4.0.1, nopt@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00= +nopt@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" + integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== dependencies: abbrev "1" osenv "^0.1.4" +nopt@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" + integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== + dependencies: + abbrev "1" + normalize-package-data@^2.3.2: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -6874,7 +7310,7 @@ normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: dependencies: remove-trailing-separator "^1.0.1" -normalize-path@^3.0.0: +normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== @@ -6915,13 +7351,6 @@ npm-packlist@^1.1.6: npm-bundled "^1.0.1" npm-normalize-package-bin "^1.0.1" -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= - dependencies: - path-key "^2.0.0" - npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" @@ -6983,17 +7412,20 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" - integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== +object-inspect@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0" + integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA== object-is@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz#6b80eb84fe451498f65007982f035a5b445edec4" - integrity sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ== + version "1.1.3" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz#2e3b9e65560137455ee3bd62aec4d90a2ea1cc81" + integrity sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.18.0-next.1" -object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: +object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== @@ -7005,15 +7437,15 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" - integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w== +object.assign@^4.1.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== dependencies: - define-properties "^1.1.2" - function-bind "^1.1.1" - has-symbols "^1.0.0" - object-keys "^1.0.11" + call-bind "^1.0.0" + define-properties "^1.1.3" + has-symbols "^1.0.1" + object-keys "^1.1.1" object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0: version "2.1.0" @@ -7038,7 +7470,7 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.1.0: +object.values@^1.1.0, object.values@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA== @@ -7055,7 +7487,7 @@ on-finished@~2.3.0: dependencies: ee-first "1.1.1" -on-headers@~1.0.1, on-headers@~1.0.2: +on-headers@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== @@ -7067,10 +7499,12 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -one-time@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e" - integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4= +one-time@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45" + integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g== + dependencies: + fn.name "1.x.x" onetime@^2.0.0: version "2.0.1" @@ -7080,24 +7514,16 @@ onetime@^2.0.0: mimic-fn "^1.0.0" openid@2.x.x: - version "2.0.6" - resolved "https://registry.yarnpkg.com/openid/-/openid-2.0.6.tgz#707375e59ab9f73025899727679b20328171c9aa" - integrity sha1-cHN15Zq59zAliZcnZ5sgMoFxyao= - dependencies: - request "^2.61.0" - -optimist@>=0.3.4, optimist@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" - integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY= + version "2.0.7" + resolved "https://registry.yarnpkg.com/openid/-/openid-2.0.7.tgz#37bf50af2aa692623364c004de35d41fd399c6e4" + integrity sha512-xH6qaz/hS55rEX8xURz4HRUO96cpj821WY6UEG9rgcusZ8Jsq54jGWP1EMCjGvgngonw8vgSljM1i2OESv16Gw== dependencies: - minimist "~0.0.1" - wordwrap "~0.0.2" + request "^2.88.2" -optimize-css-assets-webpack-plugin@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz#e2f1d4d94ad8c0af8967ebd7cf138dcb1ef14572" - integrity sha512-q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA== +optimize-css-assets-webpack-plugin@5.0.4: + version "5.0.4" + resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz#85883c6528aaa02e30bbad9908c92926bb52dc90" + integrity sha512-wqd6FdI2a5/FdoiCNNkEvLeA//lHHfG24Ln2Xm2qqdIk4aOlsR18jwpyOihqQ8849W3qu2DX8fOYxpvTMj+93A== dependencies: cssnano "^4.1.10" last-call-webpack-plugin "^3.0.0" @@ -7124,20 +7550,6 @@ os-homedir@^1.0.0: resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= -os-homedir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-2.0.0.tgz#a0c76bb001a8392a503cbd46e7e650b3423a923c" - integrity sha512-saRNz0DSC5C/I++gFIaJTXoFJMRwiP5zHar5vV3xQ2TkgEw6hDCcU5F272JjUylpiVgBrZNQHnfjkLabTfb92Q== - -os-locale@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" - integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q== - dependencies: - execa "^1.0.0" - lcid "^2.0.0" - mem "^4.0.0" - os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -7160,21 +7572,6 @@ output-file-sync@^1.1.2: mkdirp "^0.5.1" object-assign "^4.1.0" -p-defer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" - integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= - -p-is-promise@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" - integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== - p-limit@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" @@ -7182,10 +7579,17 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" -p-limit@^2.0.0, p-limit@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e" - integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ== +p-limit@^2.0.0, p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-limit@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz#1664e010af3cadc681baafd3e2a437be7b0fb5fe" + integrity sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg== dependencies: p-try "^2.0.0" @@ -7203,6 +7607,20 @@ p-locate@^3.0.0: dependencies: p-limit "^2.0.0" +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" @@ -7239,6 +7657,14 @@ param-case@^2.1.1: dependencies: no-case "^2.2.0" +param-case@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz#4be41f8399eff621c56eebb829a5e451d9801238" + integrity sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA== + dependencies: + dot-case "^3.0.3" + tslib "^1.10.0" + parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -7246,18 +7672,29 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" -parse-asn1@^5.0.0: - version "5.1.5" - resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e" - integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ== +parse-asn1@^5.0.0, parse-asn1@^5.1.5: + version "5.1.6" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4" + integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw== dependencies: - asn1.js "^4.0.0" + asn1.js "^5.2.0" browserify-aes "^1.0.0" - create-hash "^1.1.0" evp_bytestokey "^1.0.0" pbkdf2 "^3.0.3" safe-buffer "^5.1.1" +parse-entities@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8" + integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ== + dependencies: + character-entities "^1.0.0" + character-entities-legacy "^1.0.0" + character-reference-invalid "^1.0.0" + is-alphanumerical "^1.0.0" + is-decimal "^1.0.0" + is-hexadecimal "^1.0.0" + parse-glob@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" @@ -7283,6 +7720,16 @@ parse-json@^4.0.0: error-ex "^1.3.1" json-parse-better-errors "^1.0.1" +parse-json@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646" + integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" @@ -7300,6 +7747,11 @@ parseqs@0.0.5: dependencies: better-assert "~1.0.0" +parseqs@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5" + integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w== + parseuri@0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a" @@ -7307,11 +7759,24 @@ parseuri@0.0.5: dependencies: better-assert "~1.0.0" +parseuri@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a" + integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow== + parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== +pascal-case@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz#5ac1975133ed619281e88920973d2cd1f279de5f" + integrity sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA== + dependencies: + no-case "^3.0.3" + tslib "^1.10.0" + pascalcase@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" @@ -7354,13 +7819,13 @@ passport-google-oauth20@^1.0.0: passport-oauth2 "1.x.x" passport-ldapauth@^2.0.0: - version "2.1.3" - resolved "https://registry.yarnpkg.com/passport-ldapauth/-/passport-ldapauth-2.1.3.tgz#833530c31c1e2f8d2ab7a1ff97339291074dc6f6" - integrity sha512-23n425UTasN6XhcXG0qQ0h0YrS/zfo8kNIEhSLfPsNpglhYhhQFfB1pmDc5RrH+Kiz5fKLkki5BpvkKHCwkixg== + version "2.1.4" + resolved "https://registry.yarnpkg.com/passport-ldapauth/-/passport-ldapauth-2.1.4.tgz#2259e4e5d2d9c2b3d50a04f6640a941effda8da9" + integrity sha512-VeVL69ZK+cpJe0DKMSGuwcf7k+V4dr0U0Y7ZhXL785pcRb5gRA6qYZfIH+XTsAzwqTK9l0Dn3Ds4weOZ1jKkLQ== dependencies: - "@types/node" "^10.12.26" + "@types/node" "*" "@types/passport" "^1.0.0" - ldapauth-fork "^4.2.0" + ldapauth-fork "^4.3.2" passport-strategy "^1.0.0" passport-local@^1.0.0: @@ -7399,15 +7864,14 @@ passport-oauth@^1.0.0: passport-oauth2 "1.x.x" passport-saml@^1.0.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-1.3.2.tgz#6cd7e747d7fd0283877d9f48b84c55908ab4182b" - integrity sha512-oRtv1lF0AeOVGPD/UJMJnOO7AIc/Wgw7qfMxgejm2bjBo85a26LQfP+XnOD5gW7fxRdYKXDAIOvqPhFeGJmyBw== + version "1.5.0" + resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-1.5.0.tgz#4f22526b577987fb2304219c29e05d2172fca5cf" + integrity sha512-6f4bfnu/X2KNbuqshOryPap0g8BvhOrlt1qDtJdA44qzQXZ5QUMwaTmexAHIf96LTqPqQ91MzPvi5MGsOgTYTw== dependencies: debug "^3.1.0" passport-strategy "*" - q "^1.5.0" - xml-crypto "^1.4.0" - xml-encryption "^1.0.0" + xml-crypto "^2.0.0" + xml-encryption "1.2.1" xml2js "0.4.x" xmlbuilder "^11.0.0" xmldom "0.1.x" @@ -7455,6 +7919,11 @@ path-exists@^3.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -7465,7 +7934,7 @@ path-is-inside@^1.0.2: resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= -path-key@^2.0.0, path-key@^2.0.1: +path-key@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= @@ -7487,12 +7956,10 @@ path-type@^2.0.0: dependencies: pify "^2.0.0" -path-type@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" - integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== - dependencies: - pify "^3.0.0" +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== pause@0.0.1: version "0.0.1" @@ -7500,9 +7967,9 @@ pause@0.0.1: integrity sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10= pbkdf2@^3.0.3: - version "3.0.17" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6" - integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA== + version "3.1.1" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94" + integrity sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg== dependencies: create-hash "^1.1.2" create-hmac "^1.1.4" @@ -7511,24 +7978,24 @@ pbkdf2@^3.0.3: sha.js "^2.4.8" pdfobject@^2.0.201604172: - version "2.1.1" - resolved "https://registry.yarnpkg.com/pdfobject/-/pdfobject-2.1.1.tgz#2949d4d218d130d16b6149c7f7226f0a73400d4a" - integrity sha512-QFktTHyjs4q/WhGFfV2RdAbscPdNkyQb/JfFz18cwILvs9ocDiYVFAEh/jgkKGv6my+r4nlbLjwj7BHFKAupHQ== + version "2.2.4" + resolved "https://registry.yarnpkg.com/pdfobject/-/pdfobject-2.2.4.tgz#ccb3c191129298a471e9ccb59c88a3ee0b7c7530" + integrity sha512-r6Rw9CQWsrY6uqmKvlgFNoupmuRbSt9EsG0sZhSAy3cIk4WgOXyAVmebFSlLhqj6gA5NIEXL3lSEbwOOYfdUvw== -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= +peek-readable@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-3.1.0.tgz#250b08b7de09db8573d7fd8ea475215bbff14348" + integrity sha512-KGuODSTV6hcgdZvDrIDBUkN0utcAVj1LL7FfGbM0viKTtCHmtZcuEJ+lGqsp0fTFkGqesdtemV2yUSMeyy3ddA== performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -pg-connection-string@0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7" - integrity sha1-2hhHsglA5C7hSSvq9l1J2RskXfc= +pg-connection-string@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.4.0.tgz#c979922eb47832999a204da5dbe1ebf2341b6a10" + integrity sha512-3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ== pg-hstore@^2.3.3: version "2.3.3" @@ -7542,15 +8009,15 @@ pg-int8@1.0.1: resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== -pg-packet-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz#e45c3ae678b901a2873af1e17b92d787962ef914" - integrity sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg== +pg-pool@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.2.2.tgz#a560e433443ed4ad946b84d774b3f22452694dff" + integrity sha512-ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA== -pg-pool@^2.0.10: - version "2.0.10" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.10.tgz#842ee23b04e86824ce9d786430f8365082d81c4a" - integrity sha512-qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg== +pg-protocol@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.4.0.tgz#43a71a92f6fe3ac559952555aa3335c8cb4908be" + integrity sha512-El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA== pg-types@^2.1.0: version "2.2.0" @@ -7563,41 +8030,30 @@ pg-types@^2.1.0: postgres-date "~1.0.4" postgres-interval "^1.1.0" -pg@^7.12.1: - version "7.18.1" - resolved "https://registry.yarnpkg.com/pg/-/pg-7.18.1.tgz#67f59c47a99456fcb34f9fe53662b79d4a992f6d" - integrity sha512-1KtKBKg/zWrjEEv//klBbVOPGucuc7HHeJf6OEMueVcUeyF3yueHf+DvhVwBjIAe9/97RAydO/lWjkcMwssuEw== +pg@^8.2.1: + version "8.5.1" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.5.1.tgz#34dcb15f6db4a29c702bf5031ef2e1e25a06a120" + integrity sha512-9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw== dependencies: buffer-writer "2.0.0" packet-reader "1.0.0" - pg-connection-string "0.1.3" - pg-packet-stream "^1.1.0" - pg-pool "^2.0.10" + pg-connection-string "^2.4.0" + pg-pool "^3.2.2" + pg-protocol "^1.4.0" pg-types "^2.1.0" pgpass "1.x" - semver "4.3.2" pgpass@1.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz#2a7bb41b6065b67907e91da1b07c1847c877b306" - integrity sha1-Knu0G2BltnkH6R2hsHwYR8h3swY= - dependencies: - split "^1.0.0" - -phantomjs-prebuilt@^2.1.12, phantomjs-prebuilt@^2.1.3: - version "2.1.16" - resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz#efd212a4a3966d3647684ea8ba788549be2aefef" - integrity sha1-79ISpKOWbTZHaE6ouniFSb4q7+8= - dependencies: - es6-promise "^4.0.3" - extract-zip "^1.6.5" - fs-extra "^1.0.0" - hasha "^2.2.0" - kew "^0.7.0" - progress "^1.1.8" - request "^2.81.0" - request-progress "^2.0.1" - which "^1.2.10" + version "1.0.4" + resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.4.tgz#85eb93a83800b20f8057a2b029bf05abaf94ea9c" + integrity sha512-YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w== + dependencies: + split2 "^3.1.1" + +picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" + integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== pify@^2.0.0: version "2.3.0" @@ -7614,18 +8070,6 @@ pify@^4.0.1: resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== -pinkie-promise@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" - integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= - dependencies: - pinkie "^2.0.0" - -pinkie@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" - integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= - pkg-dir@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" @@ -7640,11 +8084,30 @@ pkg-dir@^3.0.0: dependencies: find-up "^3.0.0" +pkg-dir@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + pkginfo@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.2.3.tgz#7239c42a5ef6c30b8f328439d9b9ff71042490f8" integrity sha1-cjnEKl72wwuPMoQ52bn/cQQkkPg= +please-upgrade-node@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" + integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== + dependencies: + semver-compare "^1.0.0" + +pluralize@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1" + integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA== + pn@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" @@ -7661,14 +8124,13 @@ posix-character-classes@^0.1.0: integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= postcss-calc@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.1.tgz#36d77bab023b0ecbb9789d84dcb23c4941145436" - integrity sha512-oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ== + version "7.0.5" + resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e" + integrity sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg== dependencies: - css-unit-converter "^1.1.1" - postcss "^7.0.5" - postcss-selector-parser "^5.0.0-rc.4" - postcss-value-parser "^3.3.1" + postcss "^7.0.27" + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.0.2" postcss-colormin@^4.0.3: version "4.0.3" @@ -7787,19 +8249,19 @@ postcss-modules-extract-imports@^2.0.0: postcss "^7.0.5" postcss-modules-local-by-default@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915" - integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ== + version "3.0.3" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0" + integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw== dependencies: icss-utils "^4.1.1" - postcss "^7.0.16" + postcss "^7.0.32" postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.0.0" + postcss-value-parser "^4.1.0" -postcss-modules-scope@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz#33d4fc946602eb5e9355c4165d68a10727689dba" - integrity sha512-OXRUPecnHCg8b9xWvldG/jUpRIGPNRka0r4D4j0ESUU2/5IOnpsjfPPmDprM3Ih8CgZ8FXjWqaniK5v4rWt3oQ== +postcss-modules-scope@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee" + integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ== dependencies: postcss "^7.0.6" postcss-selector-parser "^6.0.0" @@ -7931,23 +8393,15 @@ postcss-selector-parser@^3.0.0: indexes-of "^1.0.1" uniq "^1.0.1" -postcss-selector-parser@^5.0.0-rc.4: - version "5.0.0" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c" - integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ== - dependencies: - cssesc "^2.0.0" - indexes-of "^1.0.1" - uniq "^1.0.1" - postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c" - integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg== + version "6.0.4" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3" + integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw== dependencies: cssesc "^3.0.0" indexes-of "^1.0.1" uniq "^1.0.1" + util-deprecate "^1.0.2" postcss-svgo@^4.0.2: version "4.0.2" @@ -7968,20 +8422,20 @@ postcss-unique-selectors@^4.0.1: postcss "^7.0.0" uniqs "^2.0.0" -postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.1: +postcss-value-parser@^3.0.0: version "3.3.1" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9" - integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ== +postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" + integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.23, postcss@^7.0.5, postcss@^7.0.6: - version "7.0.26" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.26.tgz#5ed615cfcab35ba9bbb82414a4fa88ea10429587" - integrity sha512-IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA== +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: + version "7.0.35" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24" + integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg== dependencies: chalk "^2.4.2" source-map "^0.6.1" @@ -7998,9 +8452,9 @@ postgres-bytea@~1.0.0: integrity sha1-AntTPAqokOJtFy1Hz5zOzFIazTU= postgres-date@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.4.tgz#1c2728d62ef1bff49abdd35c1f86d4bdf118a728" - integrity sha512-bESRvKVuTrjoBluEcpv2346+6kgB7UlnqWZsnbnCccTNq/pqfj1j6oBaN5+b/NrDXepYUT/HKadqv3iS9lJuVA== + version "1.0.7" + resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz#51bc086006005e5061c591cee727f2531bf641a8" + integrity sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q== postgres-interval@^1.1.0: version "1.2.0" @@ -8030,17 +8484,22 @@ preserve@^0.2.0: integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= pretty-error@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3" - integrity sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM= + version "2.1.2" + resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz#be89f82d81b1c86ec8fdfbc385045882727f93b6" + integrity sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw== dependencies: - renderkid "^2.0.1" - utila "~0.4" + lodash "^4.17.20" + renderkid "^2.0.4" -prismjs@^1.6.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.19.0.tgz#713afbd45c3baca4b321569f2df39e17e729d4dc" - integrity sha512-IVFtbW9mCWm9eOIaEkNyo2Vl4NnEifis2GQ7/MLRG5TQe6t+4Sj9J5QWI9i3v+SS43uZBlCAOn+zYTVYQcPXJw== +printj@~1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" + integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ== + +prismjs@^1.21.0: + version "1.22.0" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.22.0.tgz#73c3400afc58a823dd7eed023f8e1ce9fd8977fa" + integrity sha512-lLJ/Wt9yy0AiSYBf212kK3mM5L8ycwlyTlSxHBAneXLR0nzFMlZ5y7riFPF3E33zXOF2IH95xdY5jIyZbM9z/w== optionalDependencies: clipboard "^2.0.0" @@ -8064,11 +8523,6 @@ process@^0.11.10: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= -progress@^1.1.8: - version "1.1.8" - resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" - integrity sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74= - progress@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" @@ -8079,25 +8533,18 @@ promise-inflight@^1.0.1: resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= -promise@^7.1.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" - integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== - dependencies: - asap "~2.0.3" - proto-list@~1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= proxy-addr@~2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34" - integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ== + version "2.0.6" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" + integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== dependencies: forwarded "~0.1.2" - ipaddr.js "1.9.0" + ipaddr.js "1.9.1" prr@~1.0.1: version "1.0.1" @@ -8109,10 +8556,10 @@ pseudomap@^1.0.2: resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= -psl@^1.1.24: - version "1.7.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c" - integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ== +psl@^1.1.28: + version "1.8.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" + integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== public-encrypt@^4.0.0: version "4.0.3" @@ -8156,17 +8603,17 @@ punycode@1.3.2: resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= -punycode@^1.2.4, punycode@^1.4.1: +punycode@^1.2.4: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= -punycode@^2.1.0: +punycode@^2.1.0, punycode@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -q@^1.1.2, q@^1.5.0, q@^1.5.1: +q@^1.1.2, q@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= @@ -8227,17 +8674,17 @@ randomatic@^3.0.0: kind-of "^6.0.0" math-random "^1.0.1" -randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: +randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== dependencies: safe-buffer "^5.1.0" -randomcolor@^0.5.3: - version "0.5.4" - resolved "https://registry.yarnpkg.com/randomcolor/-/randomcolor-0.5.4.tgz#df615b13f25b89ea58c5f8f72647f0a6f07adcc3" - integrity sha512-nYd4nmTuuwMFzHL6W+UWR5fNERGZeVauho8mrJDUSXdNDbao4rbrUwhuLgKC/j8VCS5+34Ria8CsTDuBjrIrQA== +randomcolor@^0.6.0: + version "0.6.2" + resolved "https://registry.yarnpkg.com/randomcolor/-/randomcolor-0.6.2.tgz#7a57362ae1a1278439aeed2c15e5deb8ea33f56d" + integrity sha512-Mn6TbyYpFgwFuQ8KJKqf3bqqY9O1y37/0jgSK/61PUxV4QfIMv0+K2ioq8DfOjkBslcjwSzRfIDEXfzA9aCx7A== randomfill@^1.0.3: version "1.0.4" @@ -8252,26 +8699,13 @@ range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raphael@2.2.x: - version "2.2.8" - resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.2.8.tgz#4b18443c2c6030c3b492d8d11fbbca14ebe4d3f3" - integrity sha512-0kWKcGn4lXTw4eUiOhjspYiG+v0m6zSmTmlO62E0hl2CYKUvCuHER9YKqXYvOn2nj24mYp8jzHOLeBuj/Gn28Q== - dependencies: - eve-raphael "0.5.0" - -raphael@2.3.0: +raphael@2.3.0, raphael@2.3.x, raphael@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.3.0.tgz#eabeb09dba861a1d4cee077eaafb8c53f3131f89" integrity sha512-w2yIenZAQnp257XUWGni4bLMVxpUpcIl7qgxEgDIXtmSypYtlNxfXWpOBxs7LBTps5sDwhRnrToJrMUrivqNTQ== dependencies: eve-raphael "0.5.0" -"raphael@git+https://github.com/dmitrybaranovskiy/raphael": - version "2.3.0" - resolved "git+https://github.com/dmitrybaranovskiy/raphael#d8fbe4be81d362837f95e33886b80fb41de443b4" - dependencies: - eve-raphael "0.5.0" - raw-body@2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" @@ -8314,7 +8748,7 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@^2.3.7, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -8337,15 +8771,6 @@ readable-stream@1.0.27-1: isarray "0.0.1" string_decoder "~0.10.x" -"readable-stream@2 || 3", readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - "readable-stream@>=1.0.33-1 <1.1.0-0": version "1.0.34" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" @@ -8356,6 +8781,15 @@ readable-stream@1.0.27-1: isarray "0.0.1" string_decoder "~0.10.x" +readable-stream@^3.0.0, readable-stream@^3.0.1, readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + readable-stream@~2.0.0: version "2.0.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" @@ -8368,6 +8802,21 @@ readable-stream@~2.0.0: string_decoder "~0.10.x" util-deprecate "~1.0.1" +readable-web-to-node-stream@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.0.tgz#4ca5408e70471069119d691934141a52de413955" + integrity sha512-HNmLb3n0SteGAs8HQlErYPGeO+y7cvL/mVUKtXeUkl0iCZ/2GIgKGrCFHyS7UXFnO8uc9U+0y3pYIzAPsjFfvA== + dependencies: + "@types/readable-stream" "^2.3.9" + readable-stream "^3.6.0" + +readdir-glob@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz#f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4" + integrity sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA== + dependencies: + minimatch "^3.0.4" + readdirp@^2.0.0, readdirp@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" @@ -8377,18 +8826,18 @@ readdirp@^2.0.0, readdirp@^2.2.1: micromatch "^3.1.10" readable-stream "^2.0.2" +readdirp@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" + integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== + dependencies: + picomatch "^2.2.1" + readline-sync@^1.4.7: version "1.4.10" resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz#41df7fbb4b6312d673011594145705bf56d8873b" integrity sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw== -redeyed@~2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-2.1.1.tgz#8984b5815d99cb220469c99eeeffe38913e6cc0b" - integrity sha1-iYS1gV2ZyyIEacme7v/jiRPmzAs= - dependencies: - esprima "~4.0.0" - reduce-component@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/reduce-component/-/reduce-component-1.0.1.tgz#e0c93542c574521bea13df0f9488ed82ab77c5da" @@ -8399,17 +8848,10 @@ referrer-policy@1.2.0: resolved "https://registry.yarnpkg.com/referrer-policy/-/referrer-policy-1.2.0.tgz#b99cfb8b57090dc454895ef897a4cc35ef67a98e" integrity sha512-LgQJIuS6nAy1Jd88DCQRemyE3mS+ispwlqMk3b0yjZ257fI1v9c+/p6SD5gP5FGyXUIgrNOAfmyioHwZtYv2VA== -regenerate-unicode-properties@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e" - integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA== - dependencies: - regenerate "^1.4.0" - -regenerate@^1.2.1, regenerate@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" - integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg== +regenerate@^1.2.1: + version "1.4.2" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" + integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== regenerator-runtime@^0.10.5: version "0.10.5" @@ -8467,28 +8909,11 @@ regexpu-core@^2.0.0: regjsgen "^0.2.0" regjsparser "^0.1.4" -regexpu-core@^4.5.4: - version "4.6.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6" - integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg== - dependencies: - regenerate "^1.4.0" - regenerate-unicode-properties "^8.1.0" - regjsgen "^0.5.0" - regjsparser "^0.6.0" - unicode-match-property-ecmascript "^1.0.4" - unicode-match-property-value-ecmascript "^1.1.0" - regjsgen@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc= -regjsgen@^0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c" - integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg== - regjsparser@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" @@ -8496,48 +8921,588 @@ regjsparser@^0.1.4: dependencies: jsesc "~0.5.0" -regjsparser@^0.6.0: - version "0.6.3" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz#74192c5805d35e9f5ebe3c1fb5b40d40a8a38460" - integrity sha512-8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA== - dependencies: - jsesc "~0.5.0" - relateurl@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= -remarkable@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-2.0.0.tgz#795f965bede8300362ce51a716edc322d9e7a4ca" - integrity sha512-3gvKFAgL4xmmVRKAMNm6UzDo/rO2gPVkZrWagp6AXEA4JvCcMcRx9aapYbb7AJAmLLvi/u06+EhzqoS7ha9qOg== +remark-cli@8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/remark-cli/-/remark-cli-8.0.1.tgz#093e9f27c1d56a591f4c44c017de5749d4e79a08" + integrity sha512-UaYeFI5qUAzkthUd8/MLBQD5OKM6jLN8GRvF6v+KF7xO/i1jQ+X2VqUSQAxWFYxZ8R25gM56GVjeoKOZ0EIr8A== + dependencies: + markdown-extensions "^1.1.0" + remark "^12.0.0" + unified-args "^8.0.0" + +remark-lint-blockquote-indentation@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-2.0.1.tgz#27347959acf42a6c3e401488d8210e973576b254" + integrity sha512-uJ9az/Ms9AapnkWpLSCJfawBfnBI2Tn1yUsPNqIFv6YM98ymetItUMyP6ng9NFPqDvTQBbiarulkgoEo0wcafQ== + dependencies: + mdast-util-to-string "^1.0.2" + pluralize "^8.0.0" + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-code-block-style@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-code-block-style/-/remark-lint-code-block-style-2.0.1.tgz#448b0f2660acfcdfff2138d125ff5b1c1279c0cb" + integrity sha512-eRhmnColmSxJhO61GHZkvO67SpHDshVxs2j3+Zoc5Y1a4zQT2133ZAij04XKaBFfsVLjhbY/+YOWxgvtjx2nmA== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-definition-case@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-definition-case/-/remark-lint-definition-case-2.0.1.tgz#10340eb2f87acff41140d52ad7e5b40b47e6690a" + integrity sha512-M+XlThtQwEJLQnQb5Gi6xZdkw92rGp7m2ux58WMw/Qlcg02WgHR/O0OcHPe5VO5hMJrtI+cGG5T0svsCgRZd3w== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-definition-spacing@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-definition-spacing/-/remark-lint-definition-spacing-2.0.1.tgz#97f01bf9bf77a7bdf8013b124b7157dd90b07c64" + integrity sha512-xK9DOQO5MudITD189VyUiMHBIKltW1oc55L7Fti3i9DedXoBG7Phm+V9Mm7IdWzCVkquZVgVk63xQdqzSQRrSQ== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-emphasis-marker@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-emphasis-marker/-/remark-lint-emphasis-marker-2.0.1.tgz#1d5ca2070d4798d16c23120726158157796dc317" + integrity sha512-7mpbAUrSnHiWRyGkbXRL5kfSKY9Cs8cdob7Fw+Z02/pufXMF4yRWaegJ5NTUu1RE+SKlF44wtWWjvcIoyY6/aw== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-fenced-code-flag@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-fenced-code-flag/-/remark-lint-fenced-code-flag-2.0.1.tgz#2cb3ddb1157082c45760c7d01ca08e13376aaf62" + integrity sha512-+COnWHlS/h02FMxoZWxNlZW3Y8M0cQQpmx3aNCbG7xkyMyCKsMLg9EmRvYHHIbxQCuF3JT0WWx5AySqlc7d+NA== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-fenced-code-marker@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-2.0.1.tgz#7bbeb0fb45b0818a3c8a2d232cf0c723ade58ecf" + integrity sha512-lujpjm04enn3ma6lITlttadld6eQ1OWAEcT3qZzvFHp+zPraC0yr0eXlvtDN/0UH8mrln/QmGiZp3i8IdbucZg== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-file-extension@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/remark-lint-file-extension/-/remark-lint-file-extension-1.0.5.tgz#7e2feec02919aa3db5c71fda19d726a9e24a4c6c" + integrity sha512-oVQdf5vEomwHkfQ7R/mgmsWW2H/t9kSvnrxtVoNOHr+qnOEafKKDn+AFhioN2kqtjCZBAjSSrePs6xGKmXKDTw== + dependencies: + unified-lint-rule "^1.0.0" + +remark-lint-final-definition@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/remark-lint-final-definition/-/remark-lint-final-definition-2.1.0.tgz#b6e654c01ebcb1afc936d7b9cd74db8ec273e0bb" + integrity sha512-83K7n2icOHPfBzbR5Mr1o7cu8gOjD8FwJkFx/ly+rW+8SHfjCj4D3WOFGQ1xVdmHjfomBDXXDSNo2oiacADVXQ== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-hard-break-spaces@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-2.0.1.tgz#2149b55cda17604562d040c525a2a0d26aeb0f0f" + integrity sha512-Qfn/BMQFamHhtbfLrL8Co/dbYJFLRL4PGVXZ5wumkUO5f9FkZC2RsV+MD9lisvGTkJK0ZEJrVVeaPbUIFM0OAw== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-heading-increment@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-heading-increment/-/remark-lint-heading-increment-2.0.1.tgz#b578f251508a05d79bc2d1ae941e0620e23bf1d3" + integrity sha512-bYDRmv/lk3nuWXs2VSD1B4FneGT6v7a74FuVmb305hyEMmFSnneJvVgnOJxyKlbNlz12pq1IQ6MhlJBda/SFtQ== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-visit "^2.0.0" + +remark-lint-heading-style@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-heading-style/-/remark-lint-heading-style-2.0.1.tgz#8216fca67d97bbbeec8a19b6c71bfefc16549f72" + integrity sha512-IrFLNs0M5Vbn9qg51AYhGUfzgLAcDOjh2hFGMz3mx664dV6zLcNZOPSdJBBJq3JQR4gKpoXcNwN1+FFaIATj+A== + dependencies: + mdast-util-heading-style "^1.0.2" + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-visit "^2.0.0" + +remark-lint-link-title-style@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-link-title-style/-/remark-lint-link-title-style-2.0.1.tgz#51a595c69fcfa73a245a030dfaa3504938a1173a" + integrity sha512-+Q7Ew8qpOQzjqbDF6sUHmn9mKgje+m2Ho8Xz7cEnGIRaKJgtJzkn/dZqQM/az0gn3zaN6rOuwTwqw4EsT5EsIg== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + vfile-location "^3.0.0" + +remark-lint-list-item-content-indent@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-list-item-content-indent/-/remark-lint-list-item-content-indent-2.0.1.tgz#96387459440dcd61e522ab02bff138b32bfaa63a" + integrity sha512-OzUMqavxyptAdG7vWvBSMc9mLW9ZlTjbW4XGayzczd3KIr6Uwp3NEFXKx6MLtYIM/vwBqMrPQUrObOC7A2uBpQ== + dependencies: + pluralize "^8.0.0" + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-list-item-indent@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-list-item-indent/-/remark-lint-list-item-indent-2.0.1.tgz#c6472514e17bc02136ca87936260407ada90bf8d" + integrity sha512-4IKbA9GA14Q9PzKSQI6KEHU/UGO36CSQEjaDIhmb9UOhyhuzz4vWhnSIsxyI73n9nl9GGRAMNUSGzr4pQUFwTA== + dependencies: + pluralize "^8.0.0" + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-list-item-spacing@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-list-item-spacing/-/remark-lint-list-item-spacing-2.0.1.tgz#864ddda464d5cd11f725c83f00bb240538661d50" + integrity sha512-T/aRHRNxiLC0v8gsb5ljFpjm/j/nHvlbCcmE5q7+LCiKLWsv7JoERrmMyx89KaBudLRPhaFHqt6u+dfWYmj6LA== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-maximum-heading-length@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-maximum-heading-length/-/remark-lint-maximum-heading-length-2.0.1.tgz#56f240707a75b59bce3384ccc9da94548affa98f" + integrity sha512-1CjJ71YDqEpoOjUnc4wrwZV8ZGXWUIYRYeGoarAy3QKHepJL9M+zkdbOxZDfhc3tjVoDW/LWcgsW+DEpczgiMA== + dependencies: + mdast-util-to-string "^1.0.2" + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-visit "^2.0.0" + +remark-lint-maximum-line-length@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/remark-lint-maximum-line-length/-/remark-lint-maximum-line-length-2.0.3.tgz#d0d15410637d61b031a83d7c78022ec46d6c858a" + integrity sha512-zyWHBFh1oPAy+gkaVFXiTHYP2WwriIeBtaarDqkweytw0+qmuikjVMJTWbQ3+XfYBreD7KKDM9SI79nkp0/IZQ== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-no-auto-link-without-protocol@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-auto-link-without-protocol/-/remark-lint-no-auto-link-without-protocol-2.0.1.tgz#f75e5c24adb42385593e0d75ca39987edb70b6c4" + integrity sha512-TFcXxzucsfBb/5uMqGF1rQA+WJJqm1ZlYQXyvJEXigEZ8EAxsxZGPb/gOQARHl/y0vymAuYxMTaChavPKaBqpQ== + dependencies: + mdast-util-to-string "^1.0.2" + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-no-blockquote-without-marker@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-3.0.1.tgz#fb1d5a87ee6f21b731bb2ee52df55632c519a5eb" + integrity sha512-sM953+u0zN90SGd2V5hWcFbacbpaROUslS5Q5F7/aa66/2rAwh6zVnrXc4pf7fFOpj7I9Xa8Aw+uB+3RJWwdrQ== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + vfile-location "^3.0.0" + +remark-lint-no-consecutive-blank-lines@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-consecutive-blank-lines/-/remark-lint-no-consecutive-blank-lines-2.0.1.tgz#4163fa21619fe69325333f83eed8a933ed32e7ec" + integrity sha512-CP34b9AOaK1iD8FDplWvF9cJ318izoOaPXb2nb7smf/NdVHBI7joDzXcD4ojHOb3DTZuQcZ2bVv36vTPi/mv0Q== + dependencies: + pluralize "^8.0.0" + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-no-duplicate-headings@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-duplicate-headings/-/remark-lint-no-duplicate-headings-2.0.1.tgz#4a4b70e029155ebcfc03d8b2358c427b69a87576" + integrity sha512-F6AP0FJcHIlkmq0pHX0J5EGvLA9LfhuYTvnNO8y3kvflHeRjFkDyt2foz/taXR8OcLQR51n/jIJiwrrSMbiauw== + dependencies: + mdast-util-to-string "^1.0.2" + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-stringify-position "^2.0.0" + unist-util-visit "^2.0.0" + +remark-lint-no-emphasis-as-heading@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-emphasis-as-heading/-/remark-lint-no-emphasis-as-heading-2.0.1.tgz#fcc064133fe00745943c334080fed822f72711ea" + integrity sha512-z86+yWtVivtuGIxIC4g9RuATbgZgOgyLcnaleonJ7/HdGTYssjJNyqCJweaWSLoaI0akBQdDwmtJahW5iuX3/g== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-visit "^2.0.0" + +remark-lint-no-file-name-articles@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-articles/-/remark-lint-no-file-name-articles-1.0.5.tgz#4ca3425f6613f94feaef6941028583299727c339" + integrity sha512-AQk5eTb3s3TAPPjiglZgqlQj4ycao+gPs8/XkdN1VCPUtewW0GgwoQe7YEuBKayJ6ioN8dGP37Kg/P/PlKaRQA== + dependencies: + unified-lint-rule "^1.0.0" + +remark-lint-no-file-name-consecutive-dashes@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-consecutive-dashes/-/remark-lint-no-file-name-consecutive-dashes-1.0.5.tgz#e9a6f2aeab948aa249c8a8356359e3d8843a4c5c" + integrity sha512-Mg2IDsi790/dSdAzwnBnsMYdZm3qC2QgGwqOWcr0TPABJhhjC3p8r5fX4MNMTXI5It7B7bW9+ImmCeLOZiXkLg== + dependencies: + unified-lint-rule "^1.0.0" + +remark-lint-no-file-name-irregular-characters@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-irregular-characters/-/remark-lint-no-file-name-irregular-characters-1.0.5.tgz#6866f5b8370cdc916d55e7cf87bb6a55f9b6e0c6" + integrity sha512-Oe5i99qNUKc2bxmiH421o5B/kqlf1dfjAxpHNLhi2X2dXE91zRGavrlRM/4f4oR0N9Bqb3qB9JZPyMPWrzu9XA== + dependencies: + unified-lint-rule "^1.0.0" + +remark-lint-no-file-name-mixed-case@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-mixed-case/-/remark-lint-no-file-name-mixed-case-1.0.5.tgz#3e37bfef74bbdd4b07aa9ef9dd452758f8b46731" + integrity sha512-ilrUCbHZin/ENwr8c3SC2chgkFsizXjBQIB/oZ7gnm1IkCkZPiMyXZAHdpwC/DjbrpGxfMYh9JmIHao4giS5+A== + dependencies: + unified-lint-rule "^1.0.0" + +remark-lint-no-file-name-outer-dashes@^1.0.0: + version "1.0.6" + resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-outer-dashes/-/remark-lint-no-file-name-outer-dashes-1.0.6.tgz#4e0e4d42a63f0fdfb856bb5d8d8112725656e700" + integrity sha512-rT8CmcIlenegS0Yst4maYXdZfqIjBOiRUY8j/KJkORF5tKH+3O1/S07025qPGmcRihzK3w4yO0K8rgkKQw0b9w== + dependencies: + unified-lint-rule "^1.0.0" + +remark-lint-no-heading-punctuation@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-heading-punctuation/-/remark-lint-no-heading-punctuation-2.0.1.tgz#face59f9a95c8aa278a8ee0c728bc44cd53ea9ed" + integrity sha512-lY/eF6GbMeGu4cSuxfGHyvaQQBIq/6T/o+HvAR5UfxSTxmxZFwbZneAI2lbeR1zPcqOU87NsZ5ZZzWVwdLpPBw== + dependencies: + mdast-util-to-string "^1.0.2" + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-visit "^2.0.0" + +remark-lint-no-inline-padding@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-inline-padding/-/remark-lint-no-inline-padding-2.0.1.tgz#630b546566d34bde87943da318a80fc7ff856f1f" + integrity sha512-a36UlPvRrLCgxjjG3YZA9VCDvLBcoBtGNyM04VeCPz+d9hHe+5Fs1C/jL+DRLCH7nff90jJ5C/9b8/LTwhjaWA== + dependencies: + mdast-util-to-string "^1.0.2" + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-visit "^2.0.0" + +remark-lint-no-literal-urls@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-literal-urls/-/remark-lint-no-literal-urls-2.0.1.tgz#731908f9866c1880e6024dcee1269fb0f40335d6" + integrity sha512-IDdKtWOMuKVQIlb1CnsgBoyoTcXU3LppelDFAIZePbRPySVHklTtuK57kacgU5grc7gPM04bZV96eliGrRU7Iw== + dependencies: + mdast-util-to-string "^1.0.2" + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-no-multiple-toplevel-headings@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-2.0.1.tgz#3ff2b505adf720f4ff2ad2b1021f8cfd50ad8635" + integrity sha512-VKSItR6c+u3OsE5pUiSmNusERNyQS9Nnji26ezoQ1uvy06k3RypIjmzQqJ/hCkSiF+hoyC3ibtrrGT8gorzCmQ== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-stringify-position "^2.0.0" + unist-util-visit "^2.0.0" + +remark-lint-no-shell-dollars@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-2.0.2.tgz#b2c6c3ed95e5615f8e5f031c7d271a18dc17618e" + integrity sha512-zhkHZOuyaD3r/TUUkkVqW0OxsR9fnSrAnHIF63nfJoAAUezPOu8D1NBsni6rX8H2DqGbPYkoeWrNsTwiKP0yow== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-visit "^2.0.0" + +remark-lint-no-shortcut-reference-image@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-shortcut-reference-image/-/remark-lint-no-shortcut-reference-image-2.0.1.tgz#d174d12a57e8307caf6232f61a795bc1d64afeaa" + integrity sha512-2jcZBdnN6ecP7u87gkOVFrvICLXIU5OsdWbo160FvS/2v3qqqwF2e/n/e7D9Jd+KTq1mR1gEVVuTqkWWuh3cig== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-visit "^2.0.0" + +remark-lint-no-shortcut-reference-link@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-shortcut-reference-link/-/remark-lint-no-shortcut-reference-link-2.0.1.tgz#8f963f81036e45cfb7061b3639e9c6952308bc94" + integrity sha512-pTZbslG412rrwwGQkIboA8wpBvcjmGFmvugIA+UQR+GfFysKtJ5OZMPGJ98/9CYWjw9Z5m0/EktplZ5TjFjqwA== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-visit "^2.0.0" + +remark-lint-no-table-indentation@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-2.0.1.tgz#67ef344389fa40be9c6017835cf58ca417c417d0" + integrity sha512-PnqIyg5qf+QbaIfolxXpakk/MR1RxZ0EdhKgVqsaEwv8+fka1LZYu7QO+ZFmrT82gVzvjRqHJkmxTskC/VP30w== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-ordered-list-marker-style@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-2.0.1.tgz#183c31967e6f2ae8ef00effad03633f7fd00ffaa" + integrity sha512-Cnpw1Dn9CHn+wBjlyf4qhPciiJroFOEGmyfX008sQ8uGoPZsoBVIJx76usnHklojSONbpjEDcJCjnOvfAcWW1A== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-ordered-list-marker-value@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-value/-/remark-lint-ordered-list-marker-value-2.0.1.tgz#0de343de2efb41f01eae9f0f7e7d30fe43db5595" + integrity sha512-blt9rS7OKxZ2NW8tqojELeyNEwPhhTJGVa+YpUkdEH+KnrdcD7Nzhnj6zfLWOx6jFNZk3jpq5nvLFAPteHaNKg== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-rule-style@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-rule-style/-/remark-lint-rule-style-2.0.1.tgz#f59bd82e75d3eaabd0eee1c8c0f5513372eb553c" + integrity sha512-hz4Ff9UdlYmtO6Czz99WJavCjqCer7Cav4VopXt+yVIikObw96G5bAuLYcVS7hvMUGqC9ZuM02/Y/iq9n8pkAg== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-strong-marker@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-strong-marker/-/remark-lint-strong-marker-2.0.1.tgz#1ad8f190c6ac0f8138b638965ccf3bcd18f6d4e4" + integrity sha512-8X2IsW1jZ5FmW9PLfQjkL0OVy/J3xdXLcZrG1GTeQKQ91BrPFyEZqUM2oM6Y4S6LGtxWer+neZkPZNroZoRPBQ== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-table-cell-padding@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-2.0.1.tgz#b1e557ec44e1a33beb45578e97bf9441149379f6" + integrity sha512-vytUq4O1cg9UBXyeduANqpVqlbZpEtpXe/hYdvAObWgp1Jr7l74Zcvm+pn/ouaCuAsrxDVWeTa5Mg3V4OByw4g== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-table-pipe-alignment@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-2.0.1.tgz#12b7e4c54473d69c9866cb33439c718d09cffcc5" + integrity sha512-O89U7bp0ja6uQkT2uQrNB76GaPvFabrHiUGhqEUnld21yEdyj7rgS57kn84lZNSuuvN1Oor6bDyCwWQGzzpoOQ== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-table-pipes@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-table-pipes/-/remark-lint-table-pipes-2.0.1.tgz#b8594394f65053a030e8a51baa8504e388139a19" + integrity sha512-ZdR9rj1BZYXHPXFk3Gnb4agwL+CtO/SojhHua4iRBx1WCQElCeZS3M9naRrE41+2QSNkKnytgGZJzyAlm2nFGQ== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint-unordered-list-marker-style@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-2.0.1.tgz#e64692aa9594dbe7e945ae76ab2218949cd92477" + integrity sha512-8KIDJNDtgbymEvl3LkrXgdxPMTOndcux3BHhNGB2lU4UnxSpYeHsxcDgirbgU6dqCAfQfvMjPvfYk19QTF9WZA== + dependencies: + unified-lint-rule "^1.0.0" + unist-util-generated "^1.1.0" + unist-util-position "^3.0.0" + unist-util-visit "^2.0.0" + +remark-lint@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/remark-lint/-/remark-lint-7.0.1.tgz#665a5cbea9f7c95e64593f69bb6816ee8343ffdf" + integrity sha512-caZXo3qhuBxzvq9JSJFVQ/ERDq/6TJVgWn0KDwKOIJCGOuLXfQhby5XttUq+Rn7kLbNMtvwfWHJlte14LpaeXQ== dependencies: - argparse "^1.0.10" - autolinker "^3.11.0" + remark-message-control "^6.0.0" + +remark-message-control@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/remark-message-control/-/remark-message-control-6.0.0.tgz#955b054b38c197c9f2e35b1d88a4912949db7fc5" + integrity sha512-k9bt7BYc3G7YBdmeAhvd3VavrPa/XlKWR3CyHjr4sLO9xJyly8WHHT3Sp+8HPR8lEUv+/sZaffL7IjMLV0f6BA== + dependencies: + mdast-comment-marker "^1.0.0" + unified-message-control "^3.0.0" + +remark-parse@^8.0.0: + version "8.0.3" + resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1" + integrity sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q== + dependencies: + ccount "^1.0.0" + collapse-white-space "^1.0.2" + is-alphabetical "^1.0.0" + is-decimal "^1.0.0" + is-whitespace-character "^1.0.0" + is-word-character "^1.0.0" + markdown-escapes "^1.0.0" + parse-entities "^2.0.0" + repeat-string "^1.5.4" + state-toggle "^1.0.0" + trim "0.0.1" + trim-trailing-lines "^1.0.0" + unherit "^1.0.4" + unist-util-remove-position "^2.0.0" + vfile-location "^3.0.0" + xtend "^4.0.1" + +remark-preset-lint-markdown-style-guide@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-preset-lint-markdown-style-guide/-/remark-preset-lint-markdown-style-guide-3.0.1.tgz#7f160e2ded777bfb14d544e9f72c6873bdfb6da3" + integrity sha512-1C4s6TtYCPueZIkxXK8aJ6qz84WqsxA7vA11i1PBIwJuL9a254X+QlbzhhEVKp0GwV4M/YTAVcfbGWVuiNEynw== + dependencies: + remark-lint "^7.0.0" + remark-lint-blockquote-indentation "^2.0.0" + remark-lint-code-block-style "^2.0.0" + remark-lint-definition-case "^2.0.0" + remark-lint-definition-spacing "^2.0.0" + remark-lint-emphasis-marker "^2.0.0" + remark-lint-fenced-code-flag "^2.0.0" + remark-lint-fenced-code-marker "^2.0.0" + remark-lint-file-extension "^1.0.0" + remark-lint-final-definition "^2.0.0" + remark-lint-hard-break-spaces "^2.0.0" + remark-lint-heading-increment "^2.0.0" + remark-lint-heading-style "^2.0.0" + remark-lint-link-title-style "^2.0.0" + remark-lint-list-item-content-indent "^2.0.0" + remark-lint-list-item-indent "^2.0.0" + remark-lint-list-item-spacing "^2.0.0" + remark-lint-maximum-heading-length "^2.0.0" + remark-lint-maximum-line-length "^2.0.0" + remark-lint-no-auto-link-without-protocol "^2.0.0" + remark-lint-no-blockquote-without-marker "^3.0.0" + remark-lint-no-consecutive-blank-lines "^2.0.0" + remark-lint-no-duplicate-headings "^2.0.0" + remark-lint-no-emphasis-as-heading "^2.0.0" + remark-lint-no-file-name-articles "^1.0.0" + remark-lint-no-file-name-consecutive-dashes "^1.0.0" + remark-lint-no-file-name-irregular-characters "^1.0.0" + remark-lint-no-file-name-mixed-case "^1.0.0" + remark-lint-no-file-name-outer-dashes "^1.0.0" + remark-lint-no-heading-punctuation "^2.0.0" + remark-lint-no-inline-padding "^2.0.0" + remark-lint-no-literal-urls "^2.0.0" + remark-lint-no-multiple-toplevel-headings "^2.0.0" + remark-lint-no-shell-dollars "^2.0.0" + remark-lint-no-shortcut-reference-image "^2.0.0" + remark-lint-no-shortcut-reference-link "^2.0.0" + remark-lint-no-table-indentation "^2.0.0" + remark-lint-ordered-list-marker-style "^2.0.0" + remark-lint-ordered-list-marker-value "^2.0.0" + remark-lint-rule-style "^2.0.0" + remark-lint-strong-marker "^2.0.0" + remark-lint-table-cell-padding "^2.0.0" + remark-lint-table-pipe-alignment "^2.0.0" + remark-lint-table-pipes "^2.0.0" + remark-lint-unordered-list-marker-style "^2.0.0" + +remark-stringify@^8.0.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-8.1.1.tgz#e2a9dc7a7bf44e46a155ec78996db896780d8ce5" + integrity sha512-q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A== + dependencies: + ccount "^1.0.0" + is-alphanumeric "^1.0.0" + is-decimal "^1.0.0" + is-whitespace-character "^1.0.0" + longest-streak "^2.0.1" + markdown-escapes "^1.0.0" + markdown-table "^2.0.0" + mdast-util-compact "^2.0.0" + parse-entities "^2.0.0" + repeat-string "^1.5.4" + state-toggle "^1.0.0" + stringify-entities "^3.0.0" + unherit "^1.0.4" + xtend "^4.0.1" + +remark@^12.0.0: + version "12.0.1" + resolved "https://registry.yarnpkg.com/remark/-/remark-12.0.1.tgz#f1ddf68db7be71ca2bad0a33cd3678b86b9c709f" + integrity sha512-gS7HDonkdIaHmmP/+shCPejCEEW+liMp/t/QwmF0Xt47Rpuhl32lLtDV1uKWvGoq+kxr5jSgg5oAIpGuyULjUw== + dependencies: + remark-parse "^8.0.0" + remark-stringify "^8.0.0" + unified "^9.0.0" remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= -renderkid@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.3.tgz#380179c2ff5ae1365c522bf2fcfcff01c5b74149" - integrity sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA== +renderkid@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.4.tgz#d325e532afb28d3f8796ffee306be8ffd6fc864c" + integrity sha512-K2eXrSOJdq+HuKzlcjOlGoOarUu5SDguDEhE7+Ah4zuOWL40j8A/oHvLlLob9PSTNvVnBd+/q0Er1QfpEuem5g== dependencies: css-select "^1.1.0" dom-converter "^0.2" htmlparser2 "^3.3.0" + lodash "^4.17.20" strip-ansi "^3.0.0" - utila "^0.4.0" repeat-element@^1.1.2: version "1.1.3" resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== -repeat-string@^1.5.2, repeat-string@^1.6.1: +repeat-string@^1.0.0, repeat-string@^1.5.0, repeat-string@^1.5.2, repeat-string@^1.5.4, repeat-string@^1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= @@ -8549,30 +9514,28 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" -request-progress@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz#5d36bb57961c673aa5b788dbc8141fdf23b44e08" - integrity sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg= - dependencies: - throttleit "^1.0.0" +replace-ext@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" + integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs= -request-promise-core@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9" - integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ== +request-promise-core@1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f" + integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw== dependencies: - lodash "^4.17.15" + lodash "^4.17.19" request-promise-native@^1.0.5: - version "1.0.8" - resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36" - integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ== + version "1.0.9" + resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28" + integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g== dependencies: - request-promise-core "1.1.3" + request-promise-core "1.1.4" stealthy-require "^1.1.1" tough-cookie "^2.3.3" -request@2.x, "request@>= 2.52.0", request@^2.61.0, request@^2.81.0, request@^2.83.0, request@^2.86.0, request@^2.87.0, request@^2.88.0: +request@2.x, "request@>= 2.52.0", request@^2.83.0, request@^2.86.0, request@^2.87.0, request@^2.88.0, request@^2.88.2: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -8594,7 +9557,7 @@ request@2.x, "request@>= 2.52.0", request@^2.61.0, request@^2.81.0, request@^2.8 performance-now "^2.1.0" qs "~6.5.2" safe-buffer "^5.1.2" - tough-cookie "^2.4.3" + tough-cookie "~2.5.0" tunnel-agent "^0.6.0" uuid "^3.3.2" @@ -8608,11 +9571,6 @@ require-main-filename@^2.0.0: resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== -require-relative@0.8.7: - version "0.8.7" - resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de" - integrity sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4= - resolve-cwd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" @@ -8638,16 +9596,22 @@ resolve-from@^4.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== +resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.5.0, resolve@^1.8.1: - version "1.15.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" - integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== +resolve@^1.10.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.5.0, resolve@^1.8.1: + version "1.19.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c" + integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg== dependencies: + is-core-module "^2.1.0" path-parse "^1.0.6" restore-cursor@^2.0.0: @@ -8670,7 +9634,12 @@ retry-as-promised@^3.2.0: dependencies: any-promise "^1.3.0" -reveal.js@~3.9.2: +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +reveal.js@^3.9.2: version "3.9.2" resolved "https://registry.yarnpkg.com/reveal.js/-/reveal.js-3.9.2.tgz#7f63d3dfec338b6c313dcabdf006e8cf80e0b358" integrity sha512-Dvv2oA9FrtOHE2DWj5js8pMRfwq++Wmvsn1EyAdYLC80lBjTphns+tPsB652Bnvep9AVviuVS/b4XoVY9rXHLA== @@ -8685,13 +9654,6 @@ rgba-regex@^1.0.0: resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= -right-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" - integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8= - dependencies: - align-text "^0.1.1" - rimraf@2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" @@ -8706,6 +9668,13 @@ rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3: dependencies: glob "^7.1.3" +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + rimraf@~2.4.0: version "2.4.5" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da" @@ -8721,44 +9690,15 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -rollup-plugin-buble@^0.19.2: - version "0.19.8" - resolved "https://registry.yarnpkg.com/rollup-plugin-buble/-/rollup-plugin-buble-0.19.8.tgz#f9232e2bb62a7573d04f9705c1bd6f02c2a02c6a" - integrity sha512-8J4zPk2DQdk3rxeZvxgzhHh/rm5nJkjwgcsUYisCQg1QbT5yagW+hehYEW7ZNns/NVbDCTv4JQ7h4fC8qKGOKw== - dependencies: - buble "^0.19.8" - rollup-pluginutils "^2.3.3" - -rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.3: - version "2.8.2" - resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e" - integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ== - dependencies: - estree-walker "^0.6.1" - -rollup-watch@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/rollup-watch/-/rollup-watch-4.3.1.tgz#5aa1eaeab787addf368905d102b39d6fc5ce4a8b" - integrity sha512-6yjnIwfjpSrqA8IafyIu7fsEyeImNR4aDjA1bQ7KWeVuiA+Clfsx8+PGQkyABWIQzmauQ//tIJ5wAxLXsXs8qQ== - dependencies: - chokidar "^1.7.0" - require-relative "0.8.7" - rollup-pluginutils "^2.0.1" - -rollup@^0.66.2: - version "0.66.6" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.66.6.tgz#ce7d6185beb7acea644ce220c25e71ae03275482" - integrity sha512-J7/SWanrcb83vfIHqa8+aVVGzy457GcjA6GVZEnD0x2u4OnOd0Q1pCrEoNe8yLwM6z6LZP02zBT2uW0yh5TqOw== - dependencies: - "@types/estree" "0.0.39" - "@types/node" "*" - run-async@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" - integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA= - dependencies: - is-promise "^2.1.0" + version "2.4.1" + resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" + integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== + +run-parallel@^1.1.9: + version "1.1.10" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef" + integrity sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw== run-queue@^1.0.0, run-queue@^1.0.3: version "1.0.3" @@ -8773,22 +9713,27 @@ rw@1: integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q= rxjs@^6.4.0: - version "6.5.4" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c" - integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q== + version "6.6.3" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552" + integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ== dependencies: tslib "^1.9.0" -safe-buffer@*, safe-buffer@5.2.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" - integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== +safe-buffer@*, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== +safe-buffer@5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" + integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== + safe-json-stringify@~1: version "1.2.0" resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd" @@ -8801,7 +9746,7 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -8830,24 +9775,25 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.4: - version "2.6.4" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz#a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53" - integrity sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ== +schema-utils@^2.5.0, schema-utils@^2.7.0: + version "2.7.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== dependencies: - ajv "^6.10.2" - ajv-keywords "^3.4.1" + "@types/json-schema" "^7.0.5" + ajv "^6.12.4" + ajv-keywords "^3.5.2" -scope-css@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/scope-css/-/scope-css-1.2.1.tgz#c35768bc900cad030a3e0d663a818c0f6a57f40e" - integrity sha512-UjLRmyEYaDNiOS673xlVkZFlVCtckJR/dKgr434VMm7Lb+AOOqXKdAcY7PpGlJYErjXXJzKN7HWo4uRPiZZG0Q== +schema-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef" + integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA== dependencies: - escaper "^2.5.3" - slugify "^1.3.1" - strip-css-comments "^3.0.0" + "@types/json-schema" "^7.0.6" + ajv "^6.12.5" + ajv-keywords "^3.5.2" -script-loader@^0.7.2: +script-loader@0.7.2: version "0.7.2" resolved "https://registry.yarnpkg.com/script-loader/-/script-loader-0.7.2.tgz#2016db6f86f25f5cf56da38915d83378bb166ba7" integrity sha512-UMNLEvgOAQuzK8ji8qIscM3GIrRCWN6MmMXGD4SD5l6cSycgGsCo0tX5xRnfQcoghqct0tjHjcykgI1PyBE2aA== @@ -8874,17 +9820,17 @@ select@^1.1.2: resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d" integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0= +semver-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" + integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= + "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7" - integrity sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c= - -semver@^6.3.0: +semver@^6.0.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -8933,9 +9879,9 @@ sequelize-pool@^2.3.0: integrity sha512-Ibz08vnXvkZ8LJTiUOxRcj1Ckdn7qafNZ2t59jYHMX1VIebTAOYefWdRYFt6z6+hy52WGthAHAoLc9hvk3onqA== sequelize@^5.21.1: - version "5.21.4" - resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-5.21.4.tgz#a49597dbd7862e4e1fb8ec819de04705d06d9d17" - integrity sha512-Ap1pZpvKb0o3H1HuBygMi9LfCJnwYLkXNBoISqkMJ17X6MbXuOB0Pz+XazawodU1uaMl9osCSrP+Uklkc6pgQg== + version "5.22.3" + resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-5.22.3.tgz#7e7a92ddd355d883c9eb11cdb106d874d0d2636f" + integrity sha512-+nxf4TzdrB+PRmoWhR05TP9ukLAurK7qtKcIFv5Vhxm5Z9v+d2PcTT6Ea3YAoIQVkZ47QlT9XWAIUevMT/3l8Q== dependencies: bluebird "^3.5.0" cls-bluebird "^2.1.0" @@ -8953,15 +9899,19 @@ sequelize@^5.21.1: validator "^10.11.0" wkx "^0.4.8" -serialize-javascript@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61" - integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ== +serialize-javascript@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" + integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw== + dependencies: + randombytes "^2.1.0" -series-stream@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/series-stream/-/series-stream-1.0.1.tgz#311a09c5c1d5a091440832e1a480a47400f1005d" - integrity sha1-MRoJxcHVoJFECDLhpICkdADxAF0= +serialize-javascript@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" + integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA== + dependencies: + randombytes "^2.1.0" serve-static@1.14.1: version "1.14.1" @@ -9023,10 +9973,12 @@ shimmer@^1.1.0: resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337" integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw== -shortid@2.2.8: - version "2.2.8" - resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.8.tgz#033b117d6a2e975804f6f0969dbe7d3d0b355131" - integrity sha1-AzsRfWoul1gE9vCWnb59PQs1UTE= +shortid@2.2.16: + version "2.2.16" + resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608" + integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g== + dependencies: + nanoid "^2.1.0" sigmund@^1.0.1: version "1.0.1" @@ -9034,9 +9986,9 @@ sigmund@^1.0.1: integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA= signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== simple-swizzle@^0.2.2: version "0.2.2" @@ -9050,6 +10002,11 @@ slash@^1.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + slice-ansi@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" @@ -9059,10 +10016,10 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" -slugify@^1.3.1: - version "1.3.6" - resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.3.6.tgz#ba5fd6159b570fe4811d02ea9b1f4906677638c3" - integrity sha512-wA9XS475ZmGNlEnYYLPReSfuz/c3VQsEMoU43mi6OnKMCdbnFXd4/Yg7J0lBv8jkPolacMpOrWEaoYxuE1+hoQ== +sliced@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sliced/-/sliced-1.0.1.tgz#0b3a662b5d04c3177b1926bea82b03f837a2ef41" + integrity sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E= snapdragon-node@^2.0.1: version "2.1.1" @@ -9094,58 +10051,84 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -snapsvg@0.4.x: - version "0.4.0" - resolved "https://registry.yarnpkg.com/snapsvg/-/snapsvg-0.4.0.tgz#e0767014167825957de7e125c29b0fa89796ea03" - integrity sha1-4HZwFBZ4JZV95+ElwpsPqJeW6gM= +snapsvg@0.5.x: + version "0.5.1" + resolved "https://registry.yarnpkg.com/snapsvg/-/snapsvg-0.5.1.tgz#0caf52c79189a290746fc446cc5e863f6bdddfe3" + integrity sha1-DK9Sx5GJopB0b8RGzF6GP2vd3+M= dependencies: - eve "~0.4.2" + eve "~0.5.1" socket.io-adapter@~1.1.0: version "1.1.2" resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9" integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g== -socket.io-client@2.1.1, socket.io-client@~2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz#dcb38103436ab4578ddb026638ae2f21b623671f" - integrity sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ== +socket.io-client@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.0.tgz#14d5ba2e00b9bcd145ae443ab96b3f86cbcc1bb4" + integrity sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA== dependencies: backo2 "1.0.2" base64-arraybuffer "0.1.5" component-bind "1.0.0" component-emitter "1.2.1" - debug "~3.1.0" - engine.io-client "~3.2.0" + debug "~4.1.0" + engine.io-client "~3.4.0" has-binary2 "~1.0.2" has-cors "1.1.0" indexof "0.0.1" object-component "0.0.3" parseqs "0.0.5" parseuri "0.0.5" - socket.io-parser "~3.2.0" + socket.io-parser "~3.3.0" to-array "0.1.4" -socket.io-parser@~3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077" - integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA== +socket.io-client@^2.1.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.1.tgz#91a4038ef4d03c19967bb3c646fec6e0eaa78cff" + integrity sha512-YXmXn3pA8abPOY//JtYxou95Ihvzmg8U6kQyolArkIyLd0pgVhrfor/iMsox8cn07WCOOvvuJ6XKegzIucPutQ== dependencies: - component-emitter "1.2.1" + backo2 "1.0.2" + component-bind "1.0.0" + component-emitter "~1.3.0" debug "~3.1.0" - isarray "2.0.1" + engine.io-client "~3.4.0" + has-binary2 "~1.0.2" + indexof "0.0.1" + parseqs "0.0.6" + parseuri "0.0.6" + socket.io-parser "~3.3.0" + to-array "0.1.4" -socket.io@~2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz#a069c5feabee3e6b214a75b40ce0652e1cfb9980" - integrity sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA== +socket.io-parser@~3.3.0: + version "3.3.1" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.1.tgz#f07d9c8cb3fb92633aa93e76d98fd3a334623199" + integrity sha512-1QLvVAe8dTz+mKmZ07Swxt+LAo4Y1ff50rlyoEx00TQmDFVQYPfcqGvIDJLGaBdhdNCecXtyKpD+EgKGcmmbuQ== dependencies: + component-emitter "~1.3.0" debug "~3.1.0" - engine.io "~3.2.0" + isarray "2.0.1" + +socket.io-parser@~3.4.0: + version "3.4.1" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a" + integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A== + dependencies: + component-emitter "1.2.1" + debug "~4.1.0" + isarray "2.0.1" + +socket.io@^2.1.1: + version "2.3.0" + resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.3.0.tgz#cd762ed6a4faeca59bc1f3e243c0969311eb73fb" + integrity sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg== + dependencies: + debug "~4.1.0" + engine.io "~3.4.0" has-binary2 "~1.0.2" socket.io-adapter "~1.1.0" - socket.io-client "2.1.1" - socket.io-parser "~3.2.0" + socket.io-client "2.3.0" + socket.io-parser "~3.4.0" sort-keys@^1.0.0: version "1.1.2" @@ -9178,9 +10161,9 @@ source-map-support@^0.4.12, source-map-support@^0.4.15: source-map "^0.5.6" source-map-support@~0.5.12: - version "0.5.16" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042" - integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ== + version "0.5.19" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" + integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -9190,7 +10173,7 @@ source-map-url@^0.4.0: resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= -source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1: +source-map@^0.5.6, source-map@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= @@ -9200,36 +10183,36 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -sourcemap-codec@^1.4.4: - version "1.4.8" - resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" - integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== +source-map@^0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== spdx-correct@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4" - integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q== + version "3.1.1" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" + integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== dependencies: spdx-expression-parse "^3.0.0" spdx-license-ids "^3.0.0" spdx-exceptions@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977" - integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA== + version "2.3.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" + integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== spdx-expression-parse@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" - integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg== + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== dependencies: spdx-exceptions "^2.1.0" spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.5" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654" - integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q== + version "3.0.6" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz#c80757383c28abf7296744998cbc106ae8b854ce" + integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw== spin.js@^2.3.2: version "2.3.2" @@ -9243,12 +10226,12 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" -split@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" - integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== +split2@^3.1.1: + version "3.2.2" + resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f" + integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg== dependencies: - through "2" + readable-stream "^3.0.0" sprintf-js@^1.1.2: version "1.1.2" @@ -9261,18 +10244,17 @@ sprintf-js@~1.0.2: integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= sqlite3@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.1.1.tgz#539a42e476640796578e22d589b3283c28055242" - integrity sha512-CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg== + version "4.2.0" + resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.2.0.tgz#49026d665e9fc4f922e56fb9711ba5b4c85c4901" + integrity sha512-roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg== dependencies: nan "^2.12.1" node-pre-gyp "^0.11.0" - request "^2.87.0" -sqlstring@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.1.tgz#475393ff9e91479aea62dcaf0ca3d14983a7fb40" - integrity sha1-R1OT/56RR5rqYtyvDKPRSYOn+0A= +sqlstring@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.2.tgz#cdae7169389a1375b18e885f2e60b3e460809514" + integrity sha512-vF4ZbYdKS8OnoJAWBmMxCQDkiEBkGQYU7UZPtL8flbDRSNkhaXvRJ279ZtI6M+zDaQovVU4tuRgzK5fVhvFAhg== sshpk@^1.7.0: version "1.16.1" @@ -9296,6 +10278,13 @@ ssri@^6.0.1: dependencies: figgy-pudding "^3.5.1" +ssri@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz#79ca74e21f8ceaeddfcb4b90143c458b8d988808" + integrity sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA== + dependencies: + minipass "^3.1.1" + stable@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" @@ -9306,6 +10295,11 @@ stack-trace@0.0.x: resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= +state-toggle@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" + integrity sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ== + static-extend@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" @@ -9345,16 +10339,6 @@ stream-each@^1.1.0: end-of-stream "^1.1.0" stream-shift "^1.0.0" -stream-from-to@^1.4.2: - version "1.4.3" - resolved "https://registry.yarnpkg.com/stream-from-to/-/stream-from-to-1.4.3.tgz#b270473ebc514e73615727c5d2f76b229941df94" - integrity sha1-snBHPrxRTnNhVyfF0vdrIplB35Q= - dependencies: - async "^1.5.2" - concat-stream "^1.4.7" - mkdirp "^0.5.0" - series-stream "^1.0.1" - stream-http@^2.7.2: version "2.8.3" resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" @@ -9376,7 +10360,7 @@ strict-uri-encode@^1.0.0: resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= -string-loader@^0.0.1: +string-loader@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/string-loader/-/string-loader-0.0.1.tgz#496f3cccc990213e0dd5411499f9ac6a6a6f2ff8" integrity sha1-SW88zMmQIT4N1UEUmfmsampvL/g= @@ -9412,21 +10396,30 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string.prototype.trimleft@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" - integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag== +string-width@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" + integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + +string.prototype.trimend@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz#6ddd9a8796bc714b489a3ae22246a208f37bfa46" + integrity sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw== dependencies: define-properties "^1.1.3" - function-bind "^1.1.1" + es-abstract "^1.18.0-next.1" -string.prototype.trimright@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9" - integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g== +string.prototype.trimstart@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz#22d45da81015309cd0cdd79787e8919fc5c613e7" + integrity sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg== dependencies: define-properties "^1.1.3" - function-bind "^1.1.1" + es-abstract "^1.18.0-next.1" string@^3.3.3: version "3.3.3" @@ -9452,6 +10445,15 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" +stringify-entities@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-3.1.0.tgz#b8d3feac256d9ffcc9fa1fefdcf3ca70576ee903" + integrity sha512-3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg== + dependencies: + character-entities-html4 "^1.0.0" + character-entities-legacy "^1.0.0" + xtend "^4.0.0" + strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -9473,6 +10475,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + strip-ansi@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991" @@ -9483,30 +10492,19 @@ strip-bom@^3.0.0: resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= -strip-css-comments@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-css-comments/-/strip-css-comments-3.0.0.tgz#7a5625eff8a2b226cf8947a11254da96e13dae89" - integrity sha1-elYl7/iisibPiUehElTaluE9rok= - dependencies: - is-regexp "^1.0.0" - -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= - strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= -style-loader@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.3.tgz#9e826e69c683c4d9bf9db924f85e9abb30d5e200" - integrity sha512-rlkH7X/22yuwFYK357fMN/BxYOorfnfq0eD7+vqlemSK4wEcejFF1dg4zxP0euBW8NrYx2WZzZ8PPFevr7D+Kw== +strtok3@^6.0.3: + version "6.0.4" + resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-6.0.4.tgz#ede0d20fde5aa9fda56417c3558eaafccc724694" + integrity sha512-rqWMKwsbN9APU47bQTMEYTPcwdpKDtmf1jVhHzNW2cL1WqAxaM9iBb9t5P2fj+RV2YsErUWgQzHD5JwV0uCTEQ== dependencies: - loader-utils "^1.2.3" - schema-utils "^2.6.4" + "@tokenizer/token" "^0.1.1" + "@types/debug" "^4.1.5" + peek-readable "^3.1.0" stylehacks@^4.0.0: version "4.0.3" @@ -9517,6 +10515,11 @@ stylehacks@^4.0.0: postcss "^7.0.0" postcss-selector-parser "^3.0.0" +stylis@^3.5.2: + version "3.5.4" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe" + integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q== + superagent@1.8.3: version "1.8.3" resolved "https://registry.yarnpkg.com/superagent/-/superagent-1.8.3.tgz#2b7d70fcc870eda4f2a61e619dd54009b86547c3" @@ -9541,13 +10544,6 @@ supports-color@5.4.0: dependencies: has-flag "^3.0.0" -supports-color@6.1.0, supports-color@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" - integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== - dependencies: - has-flag "^3.0.0" - supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -9560,6 +10556,20 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" +supports-color@^6.0.0, supports-color@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + svgo@^1.0.0: version "1.3.2" resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" @@ -9599,20 +10609,18 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tar-stream@^1.5.0: - version "1.6.2" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555" - integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A== +tar-stream@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz#c4fb1a11eb0da29b893a5b25476397ba2d053bfa" + integrity sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw== dependencies: - bl "^1.0.0" - buffer-alloc "^1.2.0" - end-of-stream "^1.0.0" + bl "^4.0.3" + end-of-stream "^1.4.1" fs-constants "^1.0.0" - readable-stream "^2.3.0" - to-buffer "^1.1.1" - xtend "^4.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" -tar@^4, tar@^4.4.2: +tar@^4: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== @@ -9625,6 +10633,18 @@ tar@^4, tar@^4.4.2: safe-buffer "^5.1.2" yallist "^3.0.3" +tar@^6.0.2: + version "6.0.5" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz#bde815086e10b39f1dcd298e89d596e1535e200f" + integrity sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + tedious@^6.6.0: version "6.7.0" resolved "https://registry.yarnpkg.com/tedious/-/tedious-6.7.0.tgz#ad02365f16f9e0416b216e13d3f83c53addd42ca" @@ -9643,24 +10663,24 @@ tedious@^6.6.0: sprintf-js "^1.1.2" terser-webpack-plugin@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" - integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA== + version "1.4.5" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b" + integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw== dependencies: cacache "^12.0.2" find-cache-dir "^2.1.0" is-wsl "^1.1.0" schema-utils "^1.0.0" - serialize-javascript "^2.1.2" + serialize-javascript "^4.0.0" source-map "^0.6.1" terser "^4.1.2" webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser@^4.0.0, terser@^4.1.2, terser@^4.3.9: - version "4.6.3" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz#e33aa42461ced5238d352d2df2a67f21921f8d87" - integrity sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ== +terser@^4.0.0, terser@^4.1.2, terser@^4.6.3: + version "4.8.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" + integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw== dependencies: commander "^2.20.0" source-map "~0.6.1" @@ -9676,11 +10696,6 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= -throttleit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" - integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw= - through2@^0.6.5: version "0.6.5" resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" @@ -9697,22 +10712,15 @@ through2@^2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" -through2@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a" - integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww== - dependencies: - readable-stream "2 || 3" - -through@2, through@^2.3.6: +through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= timers-browserify@^2.0.4: - version "2.0.11" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz#800b1f3eee272e5bc53ee465a04d0e804c31211f" - integrity sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ== + version "2.0.12" + resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee" + integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ== dependencies: setimmediate "^1.0.4" @@ -9741,13 +10749,6 @@ tmp@^0.0.33: dependencies: os-tmpdir "~1.0.2" -tmp@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877" - integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw== - dependencies: - rimraf "^2.6.3" - to-array@0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" @@ -9758,11 +10759,6 @@ to-arraybuffer@^1.0.0: resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M= -to-buffer@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80" - integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg== - to-fast-properties@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" @@ -9783,6 +10779,13 @@ to-regex-range@^2.1.0: is-number "^3.0.0" repeat-string "^1.6.1" +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + to-regex@^3.0.1, to-regex@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" @@ -9793,11 +10796,27 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" +to-vfile@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/to-vfile/-/to-vfile-6.1.0.tgz#5f7a3f65813c2c4e34ee1f7643a5646344627699" + integrity sha512-BxX8EkCxOAZe+D/ToHdDsJcVI4HqQfmw0tCkp31zf3dNP/XWIAjU4CmeuSwsSoOzOTqHPOL0KUzyZqJplkD0Qw== + dependencies: + is-buffer "^2.0.0" + vfile "^4.0.0" + toidentifier@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== +token-types@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/token-types/-/token-types-2.0.0.tgz#b23618af744818299c6fbf125e0fdad98bab7e85" + integrity sha512-WWvu8sGK8/ZmGusekZJJ5NM6rRVTTDO7/bahz4NGiSDb/XsmdYBn6a1N/bymUHuWYTWeuLUg98wUzvE4jPdCZw== + dependencies: + "@tokenizer/token" "^0.1.0" + ieee754 "^1.1.13" + toobusy-js@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/toobusy-js/-/toobusy-js-0.5.1.tgz#5511f78f6a87a6a512d44fdb0efa13672217f659" @@ -9808,13 +10827,13 @@ toposort-class@^1.0.1: resolved "https://registry.yarnpkg.com/toposort-class/-/toposort-class-1.0.1.tgz#7ffd1f78c8be28c3ba45cd4e1a3f5ee193bd9988" integrity sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg= -tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@^2.4.3, tough-cookie@~2.4.0: - version "2.4.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" - integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ== +tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@^2.4.3, tough-cookie@~2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== dependencies: - psl "^1.1.24" - punycode "^1.4.1" + psl "^1.1.28" + punycode "^2.1.1" tr46@^1.0.1: version "1.0.1" @@ -9828,11 +10847,26 @@ trim-right@^1.0.1: resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= +trim-trailing-lines@^1.0.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0" + integrity sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ== + +trim@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" + integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0= + triple-beam@^1.2.0, triple-beam@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== +trough@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" + integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== + try-catch@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/try-catch/-/try-catch-2.0.1.tgz#a35d354187c422f291a0bcfd9eb77e3a4f90c1e5" @@ -9843,10 +10877,20 @@ try-to-catch@^1.0.2: resolved "https://registry.yarnpkg.com/try-to-catch/-/try-to-catch-1.1.1.tgz#770162dd13b9a0e55da04db5b7f888956072038a" integrity sha512-ikUlS+/BcImLhNYyIgZcEmq4byc31QpC+46/6Jm5ECWkVFhf8SM2Fp/0pMVXPX6vk45SMCwrP4Taxucne8I0VA== -tslib@^1.10.0, tslib@^1.9.0, tslib@^1.9.2, tslib@^1.9.3: - version "1.10.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" - integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== +tsconfig-paths@^3.9.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" + integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw== + dependencies: + "@types/json5" "^0.0.29" + json5 "^1.0.1" + minimist "^1.2.0" + strip-bom "^3.0.0" + +tslib@^1.10.0, tslib@^1.9.0, tslib@^1.9.2: + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tty-browserify@0.0.0: version "0.0.0" @@ -9884,11 +10928,6 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -9903,9 +10942,16 @@ type@^1.0.1: integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== type@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz#5f16ff6ef2eb44f260494dae271033b29c09a9c3" - integrity sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow== + version "2.1.0" + resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f" + integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA== + +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" typedarray@^0.0.6: version "0.0.6" @@ -9917,28 +10963,15 @@ uc.micro@^1.0.1, uc.micro@^1.0.5: resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== -uglify-js@^2.8.15: - version "2.8.29" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" - integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0= - dependencies: - source-map "~0.5.1" - yargs "~3.10.0" - optionalDependencies: - uglify-to-browserify "~1.0.0" - -uglify-js@^3.1.4, uglify-js@^3.5.1: - version "3.7.7" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.7.tgz#21e52c7dccda80a53bf7cde69628a7e511aec9c9" - integrity sha512-FeSU+hi7ULYy6mn8PKio/tXsdSXN35lm4KgV2asx00kzrLU9Pi3oAslcJT70Jdj7PHX29gGUPOT6+lXGBbemhA== - dependencies: - commander "~2.20.3" - source-map "~0.6.1" +uglify-js@^3.1.4: + version "3.11.6" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.11.6.tgz#144b50d3e05eadd3ad4dd047c60ca541a8cd4e9c" + integrity sha512-oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g== -uglify-to-browserify@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" - integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc= +uglify-js@^3.5.1: + version "3.12.2" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.2.tgz#c7ae89da0ed1bb58999c7fce07190b347fdbdaba" + integrity sha512-rWYleAvfJPjduYCt+ELvzybNah/zIkRteGXIBO8X0lteRZPGladF61hFi8tU7qKTsF7u6DUQCtT9k00VlFOgkg== uid-safe@~2.1.5: version "2.1.5" @@ -9952,56 +10985,99 @@ uid2@0.0.x: resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82" integrity sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I= -ultron@~1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" - integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og== - umzug@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.2.0.tgz#6160bdc1817e4a63a625946775063c638623e62e" - integrity sha512-xZLW76ax70pND9bx3wqwb8zqkFGzZIK8dIHD9WdNy/CrNfjWcwQgQkGCuUqcuwEBvUm+g07z+qWvY+pxDmMEEw== + version "2.3.0" + resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.3.0.tgz#0ef42b62df54e216b05dcaf627830a6a8b84a184" + integrity sha512-Z274K+e8goZK8QJxmbRPhl89HPO1K+ORFtm6rySPhFKfKc5GHhqdzD0SGhSWHkzoXasqJuItdhorSvY7/Cgflw== dependencies: - babel-runtime "^6.23.0" - bluebird "^3.5.3" - -underscore@1.8.x, underscore@~1.8.3: - version "1.8.3" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" - integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI= + bluebird "^3.7.2" -"underscore@>= 1.3.1", underscore@^1.7.0: - version "1.9.2" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.2.tgz#0c8d6f536d6f378a5af264a72f7bec50feb7cf2f" - integrity sha512-D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ== +underscore@1.11.x, "underscore@>= 1.3.1", underscore@^1.7.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.11.0.tgz#dd7c23a195db34267186044649870ff1bab5929e" + integrity sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw== underscore@~1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8" integrity sha1-izixDKze9jM3uLJOT/htRa6lKag= -unicode-canonical-property-names-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" - integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ== +underscore@~1.8.3: + version "1.8.3" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" + integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI= -unicode-match-property-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" - integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg== +unherit@^1.0.4: + version "1.1.3" + resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" + integrity sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ== dependencies: - unicode-canonical-property-names-ecmascript "^1.0.4" - unicode-property-aliases-ecmascript "^1.0.4" + inherits "^2.0.0" + xtend "^4.0.0" -unicode-match-property-value-ecmascript@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277" - integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g== +unified-args@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/unified-args/-/unified-args-8.1.0.tgz#a27dbe996a49fbbf3d9f5c6a98008ab9b0ee6ae5" + integrity sha512-t1HPS1cQPsVvt/6EtyWIbQGurza5684WGRigNghZRvzIdHm3LPgMdXPyGx0npORKzdiy5+urkF0rF5SXM8lBuQ== + dependencies: + camelcase "^5.0.0" + chalk "^3.0.0" + chokidar "^3.0.0" + fault "^1.0.2" + json5 "^2.0.0" + minimist "^1.2.0" + text-table "^0.2.0" + unified-engine "^8.0.0" + +unified-engine@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/unified-engine/-/unified-engine-8.0.0.tgz#e3996ff6eaecc6ca3408af92b70e25691192d17d" + integrity sha512-vLUezxCnjzz+ya4pYouRQVMT8k82Rk4fIj406UidRnSFJdGXFaQyQklAnalsQHJrLqAlaYPkXPUa1upfVSHGCA== + dependencies: + concat-stream "^2.0.0" + debug "^4.0.0" + fault "^1.0.0" + figures "^3.0.0" + glob "^7.0.3" + ignore "^5.0.0" + is-buffer "^2.0.0" + is-empty "^1.0.0" + is-plain-obj "^2.0.0" + js-yaml "^3.6.1" + load-plugin "^3.0.0" + parse-json "^5.0.0" + to-vfile "^6.0.0" + trough "^1.0.0" + unist-util-inspect "^5.0.0" + vfile-reporter "^6.0.0" + vfile-statistics "^1.1.0" + +unified-lint-rule@^1.0.0: + version "1.0.6" + resolved "https://registry.yarnpkg.com/unified-lint-rule/-/unified-lint-rule-1.0.6.tgz#b4ab801ff93c251faa917a8d1c10241af030de84" + integrity sha512-YPK15YBFwnsVorDFG/u0cVVQN5G2a3V8zv5/N6KN3TCG+ajKtaALcy7u14DCSrJI+gZeyYquFL9cioJXOGXSvg== + dependencies: + wrapped "^1.0.1" -unicode-property-aliases-ecmascript@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57" - integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw== +unified-message-control@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/unified-message-control/-/unified-message-control-3.0.1.tgz#7018855daea9af96082cbea35970d48c9c4dbbf2" + integrity sha512-K2Kvvp1DBzeuxYLLsumZh/gDWUTl4e2z/P3VReFirC78cfHKtQifbhnfRrSBtKtd1Uc6cvYTW0/SZIUaMAEcTg== + dependencies: + unist-util-visit "^2.0.0" + vfile-location "^3.0.0" + +unified@^9.0.0: + version "9.2.0" + resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" + integrity sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg== + dependencies: + bail "^1.0.0" + extend "^3.0.0" + is-buffer "^2.0.0" + is-plain-obj "^2.0.0" + trough "^1.0.0" + vfile "^4.0.0" union-value@^1.0.0: version "1.0.1" @@ -10037,6 +11113,59 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" +unist-util-generated@^1.1.0: + version "1.1.6" + resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" + integrity sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg== + +unist-util-inspect@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/unist-util-inspect/-/unist-util-inspect-5.0.1.tgz#168c8770a99902318ca268f8c391e294bcf44540" + integrity sha512-fPNWewS593JSmg49HbnE86BJKuBi1/nMWhDSccBvbARfxezEuJV85EaARR9/VplveiwCoLm2kWq+DhP8TBaDpw== + dependencies: + is-empty "^1.0.0" + +unist-util-is@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.3.tgz#e8b44db55fc20c43752b3346c116344d45d7c91d" + integrity sha512-bTofCFVx0iQM8Jqb1TBDVRIQW03YkD3p66JOd/aCWuqzlLyUtx1ZAGw/u+Zw+SttKvSVcvTiKYbfrtLoLefykw== + +unist-util-position@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" + integrity sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA== + +unist-util-remove-position@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc" + integrity sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA== + dependencies: + unist-util-visit "^2.0.0" + +unist-util-stringify-position@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" + integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g== + dependencies: + "@types/unist" "^2.0.2" + +unist-util-visit-parents@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6" + integrity sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^4.0.0" + +unist-util-visit@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" + integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^4.0.0" + unist-util-visit-parents "^3.0.0" + universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -10071,9 +11200,9 @@ upper-case@^1.1.1: integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg= uri-js@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" - integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== + version "4.4.0" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602" + integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g== dependencies: punycode "^2.1.0" @@ -10082,7 +11211,7 @@ urix@^0.1.0: resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= -url-loader@^2.3.0: +url-loader@2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.3.0.tgz#e0e2ef658f003efb8ca41b0f3ffbf76bab88658b" integrity sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog== @@ -10118,13 +11247,13 @@ user-home@^1.1.1: integrity sha1-K1viOjK2Onyd640PKNSFcko98ZA= utf-8-validate@^5.0.1: - version "5.0.2" - resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.2.tgz#63cfbccd85dc1f2b66cf7a1d0eebc08ed056bfb3" - integrity sha512-SwV++i2gTD5qh2XqaPzBnNX88N6HdyhQrNNRykvcS0QKvItV9u3vPEJr+X5Hhfb1JC0r0e1alL0iB09rY8+nmw== + version "5.0.3" + resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.3.tgz#3b64e418ad2ff829809025fdfef595eab2f03a27" + integrity sha512-jtJM6fpGv8C1SoH4PtG22pGto6x+Y8uPprW0tw3//gGFhDDTiuksgradgFN6yRayDP4SyZZa6ZMGHLIa17+M8A== dependencies: - node-gyp-build "~3.7.0" + node-gyp-build "^4.2.0" -util-deprecate@^1.0.1, util-deprecate@~1.0.1: +util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= @@ -10161,7 +11290,7 @@ util@^0.11.0: dependencies: inherits "2.0.3" -utila@^0.4.0, utila@~0.4: +utila@~0.4: version "0.4.0" resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw= @@ -10181,10 +11310,10 @@ uuid@^3.0.0, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2, uuid@^3.3.3: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -v8-compile-cache@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe" - integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w== +v8-compile-cache@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132" + integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== v8flags@^2.1.1: version "2.1.1" @@ -10249,6 +11378,52 @@ verror@1.6.0: dependencies: extsprintf "1.2.0" +vfile-location@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.2.0.tgz#d8e41fbcbd406063669ebf6c33d56ae8721d0f3c" + integrity sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA== + +vfile-message@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" + integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ== + dependencies: + "@types/unist" "^2.0.0" + unist-util-stringify-position "^2.0.0" + +vfile-reporter@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.1.tgz#45d4dc11df2e312196ea2ceb95e42a67fc8ce814" + integrity sha512-0OppK9mo8G2XUpv+hIKLVSDsoxJrXnOy73+vIm0jQUOUFYRduqpFHX+QqAQfvRHyX9B0UFiRuNJnBOjQCIsw1g== + dependencies: + repeat-string "^1.5.0" + string-width "^4.0.0" + supports-color "^6.0.0" + unist-util-stringify-position "^2.0.0" + vfile-sort "^2.1.2" + vfile-statistics "^1.1.0" + +vfile-sort@^2.1.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.2.2.tgz#720fe067ce156aba0b411a01bb0dc65596aa1190" + integrity sha512-tAyUqD2R1l/7Rn7ixdGkhXLD3zsg+XLAeUDUhXearjfIcpL1Hcsj5hHpCoy/gvfK/Ws61+e972fm0F7up7hfYA== + +vfile-statistics@^1.1.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.4.tgz#b99fd15ecf0f44ba088cc973425d666cb7a9f245" + integrity sha512-lXhElVO0Rq3frgPvFBwahmed3X03vjPF8OcjKMy8+F1xU/3Q3QU3tKEDp743SFtb74PdF0UWpxPvtOP0GCLheA== + +vfile@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.0.tgz#26c78ac92eb70816b01d4565e003b7e65a2a0e01" + integrity sha512-a/alcwCvtuc8OX92rqqo7PflxiCgXRFjdyoGVuYV+qbgCb0GgZJRvIgCD4+U/Kl1yhaRsaTwksF88xbPyGsgpw== + dependencies: + "@types/unist" "^2.0.0" + is-buffer "^2.0.0" + replace-ext "1.0.0" + unist-util-stringify-position "^2.0.0" + vfile-message "^2.0.0" + visibilityjs@^1.2.4: version "1.2.8" resolved "https://registry.yarnpkg.com/visibilityjs/-/visibilityjs-1.2.8.tgz#4ccdcebdaef0b34fb89219ab8e10e39c3a7cbfd8" @@ -10265,20 +11440,29 @@ vm-browserify@^1.0.1: integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== w3c-hr-time@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045" - integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU= + version "1.0.2" + resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" + integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== dependencies: - browser-process-hrtime "^0.1.2" + browser-process-hrtime "^1.0.0" -watchpack@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00" - integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA== +watchpack-chokidar2@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957" + integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww== + dependencies: + chokidar "^2.1.8" + +watchpack@^1.7.4: + version "1.7.5" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453" + integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ== dependencies: - chokidar "^2.0.2" graceful-fs "^4.1.2" neo-async "^2.5.0" + optionalDependencies: + chokidar "^3.4.1" + watchpack-chokidar2 "^2.0.1" weak-map@^1.0.5: version "1.0.5" @@ -10295,39 +11479,31 @@ webidl-conversions@^4.0.2: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== -webpack-cli@^3.3.10: - version "3.3.11" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.11.tgz#3bf21889bf597b5d82c38f215135a411edfdc631" - integrity sha512-dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g== - dependencies: - chalk "2.4.2" - cross-spawn "6.0.5" - enhanced-resolve "4.1.0" - findup-sync "3.0.0" - global-modules "2.0.0" - import-local "2.0.0" - interpret "1.2.0" - loader-utils "1.2.3" - supports-color "6.1.0" - v8-compile-cache "2.0.3" - yargs "13.2.4" - -webpack-log@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f" - integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg== +webpack-cli@3.3.12: + version "3.3.12" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz#94e9ada081453cd0aa609c99e500012fd3ad2d4a" + integrity sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag== dependencies: - ansi-colors "^3.0.0" - uuid "^3.3.2" + chalk "^2.4.2" + cross-spawn "^6.0.5" + enhanced-resolve "^4.1.1" + findup-sync "^3.0.0" + global-modules "^2.0.0" + import-local "^2.0.0" + interpret "^1.4.0" + loader-utils "^1.4.0" + supports-color "^6.1.0" + v8-compile-cache "^2.1.1" + yargs "^13.3.2" -webpack-merge@^4.2.2: +webpack-merge@4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d" integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g== dependencies: lodash "^4.17.15" -webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: +webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== @@ -10335,33 +11511,33 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@^4.41.2: - version "4.41.6" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.6.tgz#12f2f804bf6542ef166755050d4afbc8f66ba7e1" - integrity sha512-yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA== +webpack@4.44.2: + version "4.44.2" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz#6bfe2b0af055c8b2d1e90ed2cd9363f841266b72" + integrity sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q== dependencies: - "@webassemblyjs/ast" "1.8.5" - "@webassemblyjs/helper-module-context" "1.8.5" - "@webassemblyjs/wasm-edit" "1.8.5" - "@webassemblyjs/wasm-parser" "1.8.5" - acorn "^6.2.1" + "@webassemblyjs/ast" "1.9.0" + "@webassemblyjs/helper-module-context" "1.9.0" + "@webassemblyjs/wasm-edit" "1.9.0" + "@webassemblyjs/wasm-parser" "1.9.0" + acorn "^6.4.1" ajv "^6.10.2" ajv-keywords "^3.4.1" chrome-trace-event "^1.0.2" - enhanced-resolve "^4.1.0" + enhanced-resolve "^4.3.0" eslint-scope "^4.0.3" json-parse-better-errors "^1.0.2" loader-runner "^2.4.0" loader-utils "^1.2.3" memory-fs "^0.4.1" micromatch "^3.1.10" - mkdirp "^0.5.1" + mkdirp "^0.5.3" neo-async "^2.6.1" node-libs-browser "^2.2.1" schema-utils "^1.0.0" tapable "^1.1.3" terser-webpack-plugin "^1.4.3" - watchpack "^1.6.0" + watchpack "^1.7.4" webpack-sources "^1.4.1" whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3: @@ -10399,7 +11575,7 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@^1.2.10, which@^1.2.14, which@^1.2.9, which@^1.3.1: +which@^1.2.14, which@^1.2.9, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -10413,33 +11589,28 @@ wide-align@^1.1.0: dependencies: string-width "^1.0.2 || 2" -window-size@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" - integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0= - -winston-transport@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.3.0.tgz#df68c0c202482c448d9b47313c07304c2d7c2c66" - integrity sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A== +winston-transport@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz#17af518daa690d5b2ecccaa7acf7b20ca7925e59" + integrity sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw== dependencies: - readable-stream "^2.3.6" + readable-stream "^2.3.7" triple-beam "^1.2.0" winston@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.2.1.tgz#63061377976c73584028be2490a1846055f77f07" - integrity sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw== - dependencies: - async "^2.6.1" - diagnostics "^1.1.1" - is-stream "^1.1.0" - logform "^2.1.1" - one-time "0.0.4" - readable-stream "^3.1.1" + version "3.3.3" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz#ae6172042cafb29786afa3d09c8ff833ab7c9170" + integrity sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw== + dependencies: + "@dabh/diagnostics" "^2.0.2" + async "^3.1.0" + is-stream "^2.0.0" + logform "^2.2.0" + one-time "^1.0.0" + readable-stream "^3.4.0" stack-trace "0.0.x" triple-beam "^1.3.0" - winston-transport "^4.3.0" + winston-transport "^4.4.0" wkx@^0.4.8: version "0.4.8" @@ -10453,15 +11624,10 @@ word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -wordwrap@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" - integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8= - -wordwrap@~0.0.2: - version "0.0.3" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" - integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc= +wordwrap@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" + integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= worker-farm@^1.7.0: version "1.7.0" @@ -10479,6 +11645,14 @@ wrap-ansi@^5.1.0: string-width "^3.0.0" strip-ansi "^5.0.0" +wrapped@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/wrapped/-/wrapped-1.0.1.tgz#c783d9d807b273e9b01e851680a938c87c907242" + integrity sha1-x4PZ2Aeyc+mwHoUWgKk4yHyQckI= + dependencies: + co "3.1.0" + sliced "^1.0.1" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -10505,14 +11679,17 @@ ws@^6.0.0: dependencies: async-limiter "~1.0.0" -ws@~3.3.1: - version "3.3.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2" - integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA== +ws@^7.1.2: + version "7.4.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz#a5dd76a24197940d4a8bb9e0e152bb4503764da7" + integrity sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ== + +ws@~6.1.0: + version "6.1.4" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9" + integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA== dependencies: async-limiter "~1.0.0" - safe-buffer "~5.1.0" - ultron "~1.1.0" wurl@^2.5.3: version "2.5.4" @@ -10524,21 +11701,21 @@ x-xss-protection@1.3.0: resolved "https://registry.yarnpkg.com/x-xss-protection/-/x-xss-protection-1.3.0.tgz#3e3a8dd638da80421b0e9fff11a2dbe168f6d52c" integrity sha512-kpyBI9TlVipZO4diReZMAHWtS0MMa/7Kgx8hwG/EuZLiA6sg4Ah/4TRdASHhRRN3boobzcYgFRUFSgHRge6Qhg== -xml-crypto@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-1.4.0.tgz#de1cec8cd31cbd689cd90d3d6e8a27d4ae807de7" - integrity sha512-K8FRdRxICVulK4WhiTUcJrRyAIJFPVOqxfurA3x/JlmXBTxy+SkEENF6GeRt7p/rB6WSOUS9g0gXNQw5n+407g== +xml-crypto@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.0.0.tgz#54cd268ad9d31930afcf7092cbb664258ca9e826" + integrity sha512-/a04qr7RpONRZHOxROZ6iIHItdsQQjN3sj8lJkYDDss8tAkEaAs0VrFjb3tlhmS5snQru5lTs9/5ISSMdPDHlg== dependencies: xmldom "0.1.27" xpath "0.0.27" -xml-encryption@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.0.0.tgz#fe50d3bbbe2ae06876d6aa95aa3bf958284e1612" - integrity sha512-xTqcgKPN3XOswvDPXrhtyvWZ96IFcO9Azv3vS060kOpBsK5T7OxbQDxb59bPLl4b4c2IgmSZC3kJB0n5WPr2Mw== +xml-encryption@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.2.1.tgz#e6d18817c4309fd07ca7793cca93c3fd06745baa" + integrity sha512-hn5w3l5p2+nGjlmM0CAhMChDzVGhW+M37jH35Z+GJIipXbn9PUlAIRZ6I5Wm7ynlqZjFrMAr83d/CIp9VZJMTA== dependencies: escape-html "^1.0.3" - node-forge "^0.7.0" + node-forge "^0.10.0" xmldom "~0.1.15" xpath "0.0.27" @@ -10596,9 +11773,9 @@ xmldom@0.1.x, xmldom@~0.1.15: integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ== "xmldom@>= 0.1.x": - version "0.2.1" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.2.1.tgz#cac9465066f161e1c3302793ea4dbe59c518274f" - integrity sha512-kXXiYvmblIgEemGeB75y97FyaZavx6SQhGppLw5TKWAD2Wd0KAly0g23eVLh17YcpxZpnFym1Qk/eaRjy1APPg== + version "0.4.0" + resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.4.0.tgz#8771e482a333af44587e30ce026f0998c23f3830" + integrity sha512-2E93k08T30Ugs+34HBSTQLVtpi6mCddaY8uO+pMNk1pqSjV5vElzn4mmh6KLxN3hki8rNcHSYzILoh3TEWORvA== xmlhttprequest-ssl@~1.5.4: version "1.5.5" @@ -10621,14 +11798,14 @@ xpath@0.0.27: integrity sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ== xss@^1.0.3: - version "1.0.6" - resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.6.tgz#eaf11e9fc476e3ae289944a1009efddd8a124b51" - integrity sha512-6Q9TPBeNyoTRxgZFk5Ggaepk/4vUOYdOsIUYvLehcsIZTFjaavbVnsuAkLA5lIFuug5hw8zxcB9tm01gsjph2A== + version "1.0.8" + resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.8.tgz#32feb87feb74b3dcd3d404b7a68ababf10700535" + integrity sha512-3MgPdaXV8rfQ/pNn16Eio6VXYPTkqwa0vc7GkiymmY/DqR1SE/7VPAAVZz1GJsJFrllMYO3RHfEaiUGjab6TNw== dependencies: - commander "^2.9.0" + commander "^2.20.3" cssfilter "0.0.10" -"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.1: +"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== @@ -10655,75 +11832,45 @@ yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== -yargs-parser@^13.1.0, yargs-parser@^13.1.1: - version "13.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0" - integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ== +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yargs-parser@^13.1.2: + version "13.1.2" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" + integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" -yargs@13.2.4: - version "13.2.4" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83" - integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg== +yargs@^13.1.0, yargs@^13.3.2: + version "13.3.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" + integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== dependencies: cliui "^5.0.0" find-up "^3.0.0" get-caller-file "^2.0.1" - os-locale "^3.1.0" require-directory "^2.1.1" require-main-filename "^2.0.0" set-blocking "^2.0.0" string-width "^3.0.0" which-module "^2.0.0" y18n "^4.0.0" - yargs-parser "^13.1.0" - -yargs@^13.1.0: - version "13.3.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83" - integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA== - dependencies: - cliui "^5.0.0" - find-up "^3.0.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^3.0.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^13.1.1" - -yargs@~3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" - integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E= - dependencies: - camelcase "^1.0.2" - cliui "^2.1.0" - decamelize "^1.0.0" - window-size "0.1.0" - -yauzl@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005" - integrity sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU= - dependencies: - fd-slicer "~1.0.1" + yargs-parser "^13.1.2" yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk= -zip-stream@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04" - integrity sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ= +zip-stream@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.4.tgz#3a8f100b73afaa7d1ae9338d910b321dec77ff3a" + integrity sha512-a65wQ3h5gcQ/nQGWV1mSZCEzCML6EK/vyVPcrPNynySP1j3VBbQKh3nhC8CbORb+jfl2vXvh56Ul5odP1bAHqw== dependencies: - archiver-utils "^1.3.0" - compress-commons "^1.2.0" - lodash "^4.8.0" - readable-stream "^2.0.0" + archiver-utils "^2.1.0" + compress-commons "^4.0.2" + readable-stream "^3.6.0" diff --git a/pkgs/servers/web-apps/codimd/yarn.nix b/pkgs/servers/web-apps/hedgedoc/yarn.nix index d97950dd7af24..340341d0f1e3a 100644 --- a/pkgs/servers/web-apps/codimd/yarn.nix +++ b/pkgs/servers/web-apps/hedgedoc/yarn.nix @@ -10,11 +10,11 @@ }; } { - name = "_azure_ms_rest_js___ms_rest_js_1.8.14.tgz"; + name = "_azure_ms_rest_js___ms_rest_js_1.9.0.tgz"; path = fetchurl { - name = "_azure_ms_rest_js___ms_rest_js_1.8.14.tgz"; - url = "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-1.8.14.tgz"; - sha1 = "657fc145db20b6eb3d58d1a2055473aa72eb609d"; + name = "_azure_ms_rest_js___ms_rest_js_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-1.9.0.tgz"; + sha1 = "5eb6516cf20e972a2eb4c589d6b48c3151bc801b"; }; } { @@ -26,19 +26,27 @@ }; } { - name = "_babel_code_frame___code_frame_7.8.3.tgz"; + name = "_babel_code_frame___code_frame_7.12.11.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz"; - sha1 = "33e25903d7481181534e12ec0a25f16b6fcf419e"; + name = "_babel_code_frame___code_frame_7.12.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz"; + sha1 = "f4ad435aa263db935b8f10f2c552d23fb716a63f"; }; } { - name = "_babel_highlight___highlight_7.8.3.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz"; - sha1 = "28f173d04223eaaa59bc1d439a3836e6d1265797"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; + sha1 = "c9a1f021917dcb5ccf0d4e453e399022981fc9ed"; + }; + } + { + name = "_babel_highlight___highlight_7.10.4.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; + sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; }; } { @@ -50,6 +58,46 @@ }; } { + name = "_dabh_diagnostics___diagnostics_2.0.2.tgz"; + path = fetchurl { + name = "_dabh_diagnostics___diagnostics_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz"; + sha1 = "290d08f7b381b8f94607dc8f471a12c675f9db31"; + }; + } + { + name = "_nodelib_fs.scandir___fs.scandir_2.1.3.tgz"; + path = fetchurl { + name = "_nodelib_fs.scandir___fs.scandir_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; + sha1 = "3a582bdb53804c6ba6d146579c46e52130cf4a3b"; + }; + } + { + name = "_nodelib_fs.stat___fs.stat_2.0.3.tgz"; + path = fetchurl { + name = "_nodelib_fs.stat___fs.stat_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; + sha1 = "34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"; + }; + } + { + name = "_nodelib_fs.walk___fs.walk_1.2.4.tgz"; + path = fetchurl { + name = "_nodelib_fs.walk___fs.walk_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; + sha1 = "011b9202a70a6366e436ca5c065844528ab04976"; + }; + } + { + name = "_npmcli_move_file___move_file_1.0.1.tgz"; + path = fetchurl { + name = "_npmcli_move_file___move_file_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz"; + sha1 = "de103070dac0f48ce49cf6693c23af59c0f70464"; + }; + } + { name = "_passport_next_passport_openid___passport_openid_1.0.0.tgz"; path = fetchurl { name = "_passport_next_passport_openid___passport_openid_1.0.0.tgz"; @@ -66,6 +114,22 @@ }; } { + name = "_tokenizer_token___token_0.1.1.tgz"; + path = fetchurl { + name = "_tokenizer_token___token_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.1.1.tgz"; + sha1 = "f0d92c12f87079ddfd1b29f614758b9696bc29e3"; + }; + } + { + name = "_types_anymatch___anymatch_1.3.1.tgz"; + path = fetchurl { + name = "_types_anymatch___anymatch_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz"; + sha1 = "336badc1beecb9dacc38bea2cf32adf627a8421a"; + }; + } + { name = "_types_body_parser___body_parser_1.19.0.tgz"; path = fetchurl { name = "_types_body_parser___body_parser_1.19.0.tgz"; @@ -82,27 +146,27 @@ }; } { - name = "_types_estree___estree_0.0.39.tgz"; + name = "_types_debug___debug_4.1.5.tgz"; path = fetchurl { - name = "_types_estree___estree_0.0.39.tgz"; - url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz"; - sha1 = "e177e699ee1b8c22d23174caaa7422644389509f"; + name = "_types_debug___debug_4.1.5.tgz"; + url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz"; + sha1 = "b14efa8852b7768d898906613c23f688713e02cd"; }; } { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.2.tgz"; + name = "_types_express_serve_static_core___express_serve_static_core_4.17.13.tgz"; path = fetchurl { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.2.tgz"; - url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz"; - sha1 = "f6f41fa35d42e79dbf6610eccbb2637e6008a0cf"; + name = "_types_express_serve_static_core___express_serve_static_core_4.17.13.tgz"; + url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.13.tgz"; + sha1 = "d9af025e925fc8b089be37423b8d1eac781be084"; }; } { - name = "_types_express___express_4.17.2.tgz"; + name = "_types_express___express_4.17.9.tgz"; path = fetchurl { - name = "_types_express___express_4.17.2.tgz"; - url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.2.tgz"; - sha1 = "a0fb7a23d8855bac31bc01d5a58cadd9b2173e6c"; + name = "_types_express___express_4.17.9.tgz"; + url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.9.tgz"; + sha1 = "f5f2df6add703ff28428add52bdec8a1091b0a78"; }; } { @@ -114,67 +178,99 @@ }; } { - name = "_types_ldapjs___ldapjs_1.0.5.tgz"; + name = "_types_html_minifier_terser___html_minifier_terser_5.1.1.tgz"; + path = fetchurl { + name = "_types_html_minifier_terser___html_minifier_terser_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; + sha1 = "3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50"; + }; + } + { + name = "_types_json_schema___json_schema_7.0.6.tgz"; + path = fetchurl { + name = "_types_json_schema___json_schema_7.0.6.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz"; + sha1 = "f4c7ec43e81b319a9815115031709f26987891f0"; + }; + } + { + name = "_types_json5___json5_0.0.29.tgz"; + path = fetchurl { + name = "_types_json5___json5_0.0.29.tgz"; + url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz"; + sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; + }; + } + { + name = "_types_ldapjs___ldapjs_1.0.9.tgz"; + path = fetchurl { + name = "_types_ldapjs___ldapjs_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.9.tgz"; + sha1 = "1224192d14cc5ab5218fcea72ebb04489c52cb95"; + }; + } + { + name = "_types_mime___mime_2.0.3.tgz"; path = fetchurl { - name = "_types_ldapjs___ldapjs_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.5.tgz"; - sha1 = "2b078dff23dc068e12a8236b280d5fb4fd9db4db"; + name = "_types_mime___mime_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.3.tgz"; + sha1 = "c893b73721db73699943bfc3653b1deb7faa4a3a"; }; } { - name = "_types_mime___mime_2.0.1.tgz"; + name = "_types_node___node_14.14.7.tgz"; path = fetchurl { - name = "_types_mime___mime_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz"; - sha1 = "dc488842312a7f075149312905b5e3c0b054c79d"; + name = "_types_node___node_14.14.7.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.7.tgz"; + sha1 = "8ea1e8f8eae2430cf440564b98c6dfce1ec5945d"; }; } { - name = "_types_node___node_13.7.1.tgz"; + name = "_types_node___node_12.19.4.tgz"; path = fetchurl { - name = "_types_node___node_13.7.1.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-13.7.1.tgz"; - sha1 = "238eb34a66431b71d2aaddeaa7db166f25971a0d"; + name = "_types_node___node_12.19.4.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-12.19.4.tgz"; + sha1 = "cdfbb62e26c7435ed9aab9c941393cc3598e9b46"; }; } { - name = "_types_node___node_10.17.15.tgz"; + name = "_types_node___node_14.14.14.tgz"; path = fetchurl { - name = "_types_node___node_10.17.15.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-10.17.15.tgz"; - sha1 = "bfff4e23e9e70be6eec450419d51e18de1daf8e7"; + name = "_types_node___node_14.14.14.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.14.tgz"; + sha1 = "f7fd5f3cc8521301119f63910f0fb965c7d761ae"; }; } { - name = "_types_node___node_12.12.27.tgz"; + name = "_types_node___node_8.10.66.tgz"; path = fetchurl { - name = "_types_node___node_12.12.27.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.12.27.tgz"; - sha1 = "d7506f73160ad30fcebbcf5b8b7d2d976e649e42"; + name = "_types_node___node_8.10.66.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz"; + sha1 = "dd035d409df322acc83dff62a602f12a5783bbb3"; }; } { - name = "_types_node___node_8.10.59.tgz"; + name = "_types_passport___passport_1.0.4.tgz"; path = fetchurl { - name = "_types_node___node_8.10.59.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-8.10.59.tgz"; - sha1 = "9e34261f30183f9777017a13d185dfac6b899e04"; + name = "_types_passport___passport_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.4.tgz"; + sha1 = "1b35c4e197560d3974fa5f71711b6e9cce0711f0"; }; } { - name = "_types_passport___passport_1.0.2.tgz"; + name = "_types_q___q_1.5.4.tgz"; path = fetchurl { - name = "_types_passport___passport_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.2.tgz"; - sha1 = "f085033e2b301b1f97d4b57bfa73d8e934650c63"; + name = "_types_q___q_1.5.4.tgz"; + url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz"; + sha1 = "15925414e0ad2cd765bfef58842f7e26a7accb24"; }; } { - name = "_types_q___q_1.5.2.tgz"; + name = "_types_qs___qs_6.9.5.tgz"; path = fetchurl { - name = "_types_q___q_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz"; - sha1 = "690a1475b84f2a884fd07cd797c00f5f31356ea8"; + name = "_types_qs___qs_6.9.5.tgz"; + url = "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.5.tgz"; + sha1 = "434711bdd49eb5ee69d90c1d67c354a9a8ecb18b"; }; } { @@ -186,19 +282,35 @@ }; } { - name = "_types_readable_stream___readable_stream_2.3.5.tgz"; + name = "_types_readable_stream___readable_stream_2.3.9.tgz"; path = fetchurl { - name = "_types_readable_stream___readable_stream_2.3.5.tgz"; - url = "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.5.tgz"; - sha1 = "99c215f9c78563ebdfeff400246a724fb36bae4a"; + name = "_types_readable_stream___readable_stream_2.3.9.tgz"; + url = "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.9.tgz"; + sha1 = "40a8349e6ace3afd2dd1b6d8e9b02945de4566a9"; }; } { - name = "_types_serve_static___serve_static_1.13.3.tgz"; + name = "_types_serve_static___serve_static_1.13.7.tgz"; path = fetchurl { - name = "_types_serve_static___serve_static_1.13.3.tgz"; - url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.3.tgz"; - sha1 = "eb7e1c41c4468272557e897e9171ded5e2ded9d1"; + name = "_types_serve_static___serve_static_1.13.7.tgz"; + url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.7.tgz"; + sha1 = "e51b51a0becda910f9fd04c718044da69d6c492e"; + }; + } + { + name = "_types_source_list_map___source_list_map_0.1.2.tgz"; + path = fetchurl { + name = "_types_source_list_map___source_list_map_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz"; + sha1 = "0078836063ffaf17412349bba364087e0ac02ec9"; + }; + } + { + name = "_types_tapable___tapable_1.0.6.tgz"; + path = fetchurl { + name = "_types_tapable___tapable_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz"; + sha1 = "a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74"; }; } { @@ -210,147 +322,179 @@ }; } { - name = "_webassemblyjs_ast___ast_1.8.5.tgz"; + name = "_types_uglify_js___uglify_js_3.11.1.tgz"; + path = fetchurl { + name = "_types_uglify_js___uglify_js_3.11.1.tgz"; + url = "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.11.1.tgz"; + sha1 = "97ff30e61a0aa6876c270b5f538737e2d6ab8ceb"; + }; + } + { + name = "_types_unist___unist_2.0.3.tgz"; + path = fetchurl { + name = "_types_unist___unist_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz"; + sha1 = "9c088679876f374eb5983f150d4787aa6fb32d7e"; + }; + } + { + name = "_types_webpack_sources___webpack_sources_2.0.0.tgz"; + path = fetchurl { + name = "_types_webpack_sources___webpack_sources_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.0.0.tgz"; + sha1 = "08216ab9be2be2e1499beaebc4d469cec81e82a7"; + }; + } + { + name = "_types_webpack___webpack_4.41.25.tgz"; path = fetchurl { - name = "_webassemblyjs_ast___ast_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz"; - sha1 = "51b1c5fe6576a34953bf4b253df9f0d490d9e359"; + name = "_types_webpack___webpack_4.41.25.tgz"; + url = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.25.tgz"; + sha1 = "4d3b5aecc4e44117b376280fbfd2dc36697968c4"; }; } { - name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.8.5.tgz"; + name = "_webassemblyjs_ast___ast_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz"; - sha1 = "1ba926a2923613edce496fd5b02e8ce8a5f49721"; + name = "_webassemblyjs_ast___ast_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz"; + sha1 = "bd850604b4042459a5a41cd7d338cbed695ed964"; }; } { - name = "_webassemblyjs_helper_api_error___helper_api_error_1.8.5.tgz"; + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_api_error___helper_api_error_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz"; - sha1 = "c49dad22f645227c5edb610bdb9697f1aab721f7"; + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz"; + sha1 = "3c3d3b271bddfc84deb00f71344438311d52ffb4"; }; } { - name = "_webassemblyjs_helper_buffer___helper_buffer_1.8.5.tgz"; + name = "_webassemblyjs_helper_api_error___helper_api_error_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_buffer___helper_buffer_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz"; - sha1 = "fea93e429863dd5e4338555f42292385a653f204"; + name = "_webassemblyjs_helper_api_error___helper_api_error_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz"; + sha1 = "203f676e333b96c9da2eeab3ccef33c45928b6a2"; }; } { - name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.8.5.tgz"; + name = "_webassemblyjs_helper_buffer___helper_buffer_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz"; - sha1 = "9a740ff48e3faa3022b1dff54423df9aa293c25e"; + name = "_webassemblyjs_helper_buffer___helper_buffer_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz"; + sha1 = "a1442d269c5feb23fcbc9ef759dac3547f29de00"; }; } { - name = "_webassemblyjs_helper_fsm___helper_fsm_1.8.5.tgz"; + name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_fsm___helper_fsm_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz"; - sha1 = "ba0b7d3b3f7e4733da6059c9332275d860702452"; + name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz"; + sha1 = "647f8892cd2043a82ac0c8c5e75c36f1d9159f27"; }; } { - name = "_webassemblyjs_helper_module_context___helper_module_context_1.8.5.tgz"; + name = "_webassemblyjs_helper_fsm___helper_fsm_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_module_context___helper_module_context_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz"; - sha1 = "def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"; + name = "_webassemblyjs_helper_fsm___helper_fsm_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz"; + sha1 = "c05256b71244214671f4b08ec108ad63b70eddb8"; }; } { - name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.8.5.tgz"; + name = "_webassemblyjs_helper_module_context___helper_module_context_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz"; - sha1 = "537a750eddf5c1e932f3744206551c91c1b93e61"; + name = "_webassemblyjs_helper_module_context___helper_module_context_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz"; + sha1 = "25d8884b76839871a08a6c6f806c3979ef712f07"; }; } { - name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.8.5.tgz"; + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz"; - sha1 = "74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"; + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz"; + sha1 = "4fed8beac9b8c14f8c58b70d124d549dd1fe5790"; }; } { - name = "_webassemblyjs_ieee754___ieee754_1.8.5.tgz"; + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_ieee754___ieee754_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz"; - sha1 = "712329dbef240f36bf57bd2f7b8fb9bf4154421e"; + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz"; + sha1 = "5a4138d5a6292ba18b04c5ae49717e4167965346"; }; } { - name = "_webassemblyjs_leb128___leb128_1.8.5.tgz"; + name = "_webassemblyjs_ieee754___ieee754_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_leb128___leb128_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz"; - sha1 = "044edeb34ea679f3e04cd4fd9824d5e35767ae10"; + name = "_webassemblyjs_ieee754___ieee754_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz"; + sha1 = "15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"; }; } { - name = "_webassemblyjs_utf8___utf8_1.8.5.tgz"; + name = "_webassemblyjs_leb128___leb128_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_utf8___utf8_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz"; - sha1 = "a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"; + name = "_webassemblyjs_leb128___leb128_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz"; + sha1 = "f19ca0b76a6dc55623a09cffa769e838fa1e1c95"; }; } { - name = "_webassemblyjs_wasm_edit___wasm_edit_1.8.5.tgz"; + name = "_webassemblyjs_utf8___utf8_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_wasm_edit___wasm_edit_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz"; - sha1 = "962da12aa5acc1c131c81c4232991c82ce56e01a"; + name = "_webassemblyjs_utf8___utf8_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz"; + sha1 = "04d33b636f78e6a6813227e82402f7637b6229ab"; }; } { - name = "_webassemblyjs_wasm_gen___wasm_gen_1.8.5.tgz"; + name = "_webassemblyjs_wasm_edit___wasm_edit_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_wasm_gen___wasm_gen_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz"; - sha1 = "54840766c2c1002eb64ed1abe720aded714f98bc"; + name = "_webassemblyjs_wasm_edit___wasm_edit_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz"; + sha1 = "3fe6d79d3f0f922183aa86002c42dd256cfee9cf"; }; } { - name = "_webassemblyjs_wasm_opt___wasm_opt_1.8.5.tgz"; + name = "_webassemblyjs_wasm_gen___wasm_gen_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_wasm_opt___wasm_opt_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz"; - sha1 = "b24d9f6ba50394af1349f510afa8ffcb8a63d264"; + name = "_webassemblyjs_wasm_gen___wasm_gen_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz"; + sha1 = "50bc70ec68ded8e2763b01a1418bf43491a7a49c"; }; } { - name = "_webassemblyjs_wasm_parser___wasm_parser_1.8.5.tgz"; + name = "_webassemblyjs_wasm_opt___wasm_opt_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_wasm_parser___wasm_parser_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz"; - sha1 = "21576f0ec88b91427357b8536383668ef7c66b8d"; + name = "_webassemblyjs_wasm_opt___wasm_opt_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz"; + sha1 = "2211181e5b31326443cc8112eb9f0b9028721a61"; }; } { - name = "_webassemblyjs_wast_parser___wast_parser_1.8.5.tgz"; + name = "_webassemblyjs_wasm_parser___wasm_parser_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_wast_parser___wast_parser_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz"; - sha1 = "e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"; + name = "_webassemblyjs_wasm_parser___wasm_parser_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz"; + sha1 = "9d48e44826df4a6598294aa6c87469d642fff65e"; }; } { - name = "_webassemblyjs_wast_printer___wast_printer_1.8.5.tgz"; + name = "_webassemblyjs_wast_parser___wast_parser_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_wast_printer___wast_printer_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz"; - sha1 = "114bbc481fd10ca0e23b3560fa812748b0bae5bc"; + name = "_webassemblyjs_wast_parser___wast_parser_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz"; + sha1 = "3031115d79ac5bd261556cecc3fa90a3ef451914"; + }; + } + { + name = "_webassemblyjs_wast_printer___wast_printer_1.9.0.tgz"; + path = fetchurl { + name = "_webassemblyjs_wast_printer___wast_printer_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz"; + sha1 = "4935d54c85fef637b00ce9f52377451d00d47899"; }; } { @@ -394,11 +538,11 @@ }; } { - name = "abab___abab_2.0.3.tgz"; + name = "abab___abab_2.0.5.tgz"; path = fetchurl { - name = "abab___abab_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz"; - sha1 = "623e2075e02eb2d3f2475e49f99c91846467907a"; + name = "abab___abab_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz"; + sha1 = "c0b678fb32d60fc1219c784d6a826fe385aeb79a"; }; } { @@ -418,14 +562,6 @@ }; } { - name = "acorn_dynamic_import___acorn_dynamic_import_4.0.0.tgz"; - path = fetchurl { - name = "acorn_dynamic_import___acorn_dynamic_import_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz"; - sha1 = "482210140582a36b83c3e342e1cfebcaa9240948"; - }; - } - { name = "acorn_globals___acorn_globals_4.3.4.tgz"; path = fetchurl { name = "acorn_globals___acorn_globals_4.3.4.tgz"; @@ -434,11 +570,11 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz"; - sha1 = "294adb71b57398b0680015f0a38c563ee1db5384"; + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; }; } { @@ -450,35 +586,19 @@ }; } { - name = "acorn_walk___acorn_walk_7.1.1.tgz"; - path = fetchurl { - name = "acorn_walk___acorn_walk_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz"; - sha1 = "345f0dffad5c735e7373d2fec9a1023e6a44b83e"; - }; - } - { - name = "acorn___acorn_5.7.3.tgz"; - path = fetchurl { - name = "acorn___acorn_5.7.3.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz"; - sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279"; - }; - } - { - name = "acorn___acorn_6.4.0.tgz"; + name = "acorn___acorn_5.7.4.tgz"; path = fetchurl { - name = "acorn___acorn_6.4.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz"; - sha1 = "b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"; + name = "acorn___acorn_5.7.4.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz"; + sha1 = "3e8d8a9947d0599a1796d10225d7432f4a4acf5e"; }; } { - name = "acorn___acorn_7.1.0.tgz"; + name = "acorn___acorn_6.4.2.tgz"; path = fetchurl { - name = "acorn___acorn_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz"; - sha1 = "949d36f2c292535da602283586c2477c57eb2d6c"; + name = "acorn___acorn_6.4.2.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz"; + sha1 = "35866fd710528e92de10cf06016498e47e39e1e6"; }; } { @@ -498,35 +618,35 @@ }; } { - name = "ajv_errors___ajv_errors_1.0.1.tgz"; + name = "aggregate_error___aggregate_error_3.1.0.tgz"; path = fetchurl { - name = "ajv_errors___ajv_errors_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz"; - sha1 = "f35986aceb91afadec4102fbd85014950cefa64d"; + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha1 = "92670ff50f5359bdb7a3e0d40d0ec30c5737687a"; }; } { - name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; + name = "ajv_errors___ajv_errors_1.0.1.tgz"; path = fetchurl { - name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; - sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da"; + name = "ajv_errors___ajv_errors_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz"; + sha1 = "f35986aceb91afadec4102fbd85014950cefa64d"; }; } { - name = "ajv___ajv_6.11.0.tgz"; + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; path = fetchurl { - name = "ajv___ajv_6.11.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz"; - sha1 = "c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"; + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; }; } { - name = "align_text___align_text_0.1.4.tgz"; + name = "ajv___ajv_6.12.6.tgz"; path = fetchurl { - name = "align_text___align_text_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz"; - sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; }; } { @@ -538,14 +658,6 @@ }; } { - name = "ansi_colors___ansi_colors_3.2.4.tgz"; - path = fetchurl { - name = "ansi_colors___ansi_colors_3.2.4.tgz"; - url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz"; - sha1 = "e3a3da4bfbae6c86a9c285625de124a234026fbf"; - }; - } - { name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; path = fetchurl { name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; @@ -578,6 +690,14 @@ }; } { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + }; + } + { name = "ansi_styles___ansi_styles_2.2.1.tgz"; path = fetchurl { name = "ansi_styles___ansi_styles_2.2.1.tgz"; @@ -594,19 +714,19 @@ }; } { - name = "ansi_styles___ansi_styles_1.0.0.tgz"; + name = "ansi_styles___ansi_styles_4.3.0.tgz"; path = fetchurl { - name = "ansi_styles___ansi_styles_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz"; - sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178"; + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; }; } { - name = "ansicolors___ansicolors_0.3.2.tgz"; + name = "ansi_styles___ansi_styles_1.0.0.tgz"; path = fetchurl { - name = "ansicolors___ansicolors_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz"; - sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; + name = "ansi_styles___ansi_styles_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz"; + sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178"; }; } { @@ -634,6 +754,14 @@ }; } { + name = "anymatch___anymatch_3.1.1.tgz"; + path = fetchurl { + name = "anymatch___anymatch_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz"; + sha1 = "c55ecf02185e2469259399310c173ce31233b142"; + }; + } + { name = "aproba___aproba_1.2.0.tgz"; path = fetchurl { name = "aproba___aproba_1.2.0.tgz"; @@ -642,19 +770,19 @@ }; } { - name = "archiver_utils___archiver_utils_1.3.0.tgz"; + name = "archiver_utils___archiver_utils_2.1.0.tgz"; path = fetchurl { - name = "archiver_utils___archiver_utils_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-1.3.0.tgz"; - sha1 = "e50b4c09c70bf3d680e32ff1b7994e9f9d895174"; + name = "archiver_utils___archiver_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz"; + sha1 = "e8a460e94b693c3e3da182a098ca6285ba9249e2"; }; } { - name = "archiver___archiver_2.1.1.tgz"; + name = "archiver___archiver_5.1.0.tgz"; path = fetchurl { - name = "archiver___archiver_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/archiver/-/archiver-2.1.1.tgz"; - sha1 = "ff662b4a78201494a3ee544d3a33fe7496509ebc"; + name = "archiver___archiver_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/archiver/-/archiver-5.1.0.tgz"; + sha1 = "05b0f6f7836f3e6356a0532763d2bb91017a7e37"; }; } { @@ -730,19 +858,11 @@ }; } { - name = "array_union___array_union_1.0.2.tgz"; - path = fetchurl { - name = "array_union___array_union_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz"; - sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; - }; - } - { - name = "array_uniq___array_uniq_1.0.3.tgz"; + name = "array_union___array_union_2.1.0.tgz"; path = fetchurl { - name = "array_uniq___array_uniq_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz"; - sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + name = "array_union___array_union_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz"; + sha1 = "b798420adbeb1de828d84acd8a2e23d3efe85e8d"; }; } { @@ -786,11 +906,11 @@ }; } { - name = "asn1.js___asn1.js_4.10.1.tgz"; + name = "asn1.js___asn1.js_5.4.1.tgz"; path = fetchurl { - name = "asn1.js___asn1.js_4.10.1.tgz"; - url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz"; - sha1 = "b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"; + name = "asn1.js___asn1.js_5.4.1.tgz"; + url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz"; + sha1 = "11a980b84ebb91781ce35b0fdc2ee294e3783f07"; }; } { @@ -866,11 +986,11 @@ }; } { - name = "async___async_3.1.1.tgz"; + name = "async___async_3.2.0.tgz"; path = fetchurl { - name = "async___async_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-3.1.1.tgz"; - sha1 = "dd3542db03de837979c9ebbca64ca01b06dc98df"; + name = "async___async_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz"; + sha1 = "b3a2685c5ebb641d3de02d161002c60fc9f85720"; }; } { @@ -906,19 +1026,11 @@ }; } { - name = "autolinker___autolinker_3.12.0.tgz"; + name = "aws_sdk___aws_sdk_2.817.0.tgz"; path = fetchurl { - name = "autolinker___autolinker_3.12.0.tgz"; - url = "https://registry.yarnpkg.com/autolinker/-/autolinker-3.12.0.tgz"; - sha1 = "1184397c85828041975a3b3135032b7b931966c6"; - }; - } - { - name = "aws_sdk___aws_sdk_2.619.0.tgz"; - path = fetchurl { - name = "aws_sdk___aws_sdk_2.619.0.tgz"; - url = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.619.0.tgz"; - sha1 = "daacd97fb8d948c10278071129c12908039ab542"; + name = "aws_sdk___aws_sdk_2.817.0.tgz"; + url = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.817.0.tgz"; + sha1 = "3a97b690b0ec494cf8ee927affb3973cf26abcc8"; }; } { @@ -930,11 +1042,11 @@ }; } { - name = "aws4___aws4_1.9.1.tgz"; + name = "aws4___aws4_1.11.0.tgz"; path = fetchurl { - name = "aws4___aws4_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz"; - sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e"; + name = "aws4___aws4_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz"; + sha1 = "d61f46d83b2519250e2784daf5b09479a8b41c59"; }; } { @@ -1426,6 +1538,14 @@ }; } { + name = "bail___bail_1.0.5.tgz"; + path = fetchurl { + name = "bail___bail_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz"; + sha1 = "b6fa133404a392cbc1f8c4bf63f5953351e7a776"; + }; + } + { name = "balanced_match___balanced_match_1.0.0.tgz"; path = fetchurl { name = "balanced_match___balanced_match_1.0.0.tgz"; @@ -1434,6 +1554,14 @@ }; } { + name = "base64_arraybuffer___base64_arraybuffer_0.1.4.tgz"; + path = fetchurl { + name = "base64_arraybuffer___base64_arraybuffer_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz"; + sha1 = "9818c79e059b1355f97e0428a017c838e90ba812"; + }; + } + { name = "base64_arraybuffer___base64_arraybuffer_0.1.5.tgz"; path = fetchurl { name = "base64_arraybuffer___base64_arraybuffer_0.1.5.tgz"; @@ -1442,19 +1570,19 @@ }; } { - name = "base64_js___base64_js_1.3.1.tgz"; + name = "base64_js___base64_js_1.5.1.tgz"; path = fetchurl { - name = "base64_js___base64_js_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz"; - sha1 = "58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"; + name = "base64_js___base64_js_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; + sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; }; } { - name = "base64id___base64id_1.0.0.tgz"; + name = "base64id___base64id_2.0.0.tgz"; path = fetchurl { - name = "base64id___base64id_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz"; - sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"; + name = "base64id___base64id_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz"; + sha1 = "2770ac6bc47d312af97a8bf9a634342e0cd25cb6"; }; } { @@ -1522,35 +1650,35 @@ }; } { - name = "bindings___bindings_1.5.0.tgz"; + name = "binary_extensions___binary_extensions_2.1.0.tgz"; path = fetchurl { - name = "bindings___bindings_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; - sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; + name = "binary_extensions___binary_extensions_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz"; + sha1 = "30fa40c9e7fe07dbc895678cd287024dea241dd9"; }; } { - name = "bl___bl_1.2.2.tgz"; + name = "bindings___bindings_1.5.0.tgz"; path = fetchurl { - name = "bl___bl_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz"; - sha1 = "a160911717103c07410cef63ef51b397c025af9c"; + name = "bindings___bindings_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; + sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; }; } { - name = "bl___bl_3.0.0.tgz"; + name = "bl___bl_3.0.1.tgz"; path = fetchurl { - name = "bl___bl_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/bl/-/bl-3.0.0.tgz"; - sha1 = "3611ec00579fd18561754360b21e9f784500ff88"; + name = "bl___bl_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz"; + sha1 = "1cbb439299609e419b5a74d7fce2f8b37d8e5c6f"; }; } { - name = "blint___blint_1.1.0.tgz"; + name = "bl___bl_4.0.3.tgz"; path = fetchurl { - name = "blint___blint_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/blint/-/blint-1.1.0.tgz"; - sha1 = "9fcc8134296651099062f8d2ee359e83c7bff8ba"; + name = "bl___bl_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz"; + sha1 = "12d6287adc29080e22a705e5764b2a9522cdc489"; }; } { @@ -1578,11 +1706,19 @@ }; } { - name = "bn.js___bn.js_4.11.8.tgz"; + name = "bn.js___bn.js_4.11.9.tgz"; path = fetchurl { - name = "bn.js___bn.js_4.11.8.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz"; - sha1 = "2cde09eb5ee341f484746bb0309b3253b1b1442f"; + name = "bn.js___bn.js_4.11.9.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz"; + sha1 = "26d556829458f9d1e81fc48952493d0ba3507828"; + }; + } + { + name = "bn.js___bn.js_5.1.3.tgz"; + path = fetchurl { + name = "bn.js___bn.js_5.1.3.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz"; + sha1 = "beca005408f642ebebea80b042b4d18d2ac0ee6b"; }; } { @@ -1650,6 +1786,14 @@ }; } { + name = "braces___braces_3.0.2.tgz"; + path = fetchurl { + name = "braces___braces_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; + sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + }; + } + { name = "brorand___brorand_1.1.0.tgz"; path = fetchurl { name = "brorand___brorand_1.1.0.tgz"; @@ -1658,11 +1802,11 @@ }; } { - name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz"; + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; path = fetchurl { - name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz"; - sha1 = "616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"; + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; + sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626"; }; } { @@ -1706,19 +1850,19 @@ }; } { - name = "browserify_rsa___browserify_rsa_4.0.1.tgz"; + name = "browserify_rsa___browserify_rsa_4.1.0.tgz"; path = fetchurl { - name = "browserify_rsa___browserify_rsa_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; - sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; + name = "browserify_rsa___browserify_rsa_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz"; + sha1 = "b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"; }; } { - name = "browserify_sign___browserify_sign_4.0.4.tgz"; + name = "browserify_sign___browserify_sign_4.2.1.tgz"; path = fetchurl { - name = "browserify_sign___browserify_sign_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz"; - sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; + name = "browserify_sign___browserify_sign_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz"; + sha1 = "eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"; }; } { @@ -1738,35 +1882,11 @@ }; } { - name = "browserslist___browserslist_4.8.7.tgz"; + name = "browserslist___browserslist_4.14.7.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.8.7.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.7.tgz"; - sha1 = "ec8301ff415e6a42c949d0e66b405eb539c532d0"; - }; - } - { - name = "buble___buble_0.19.8.tgz"; - path = fetchurl { - name = "buble___buble_0.19.8.tgz"; - url = "https://registry.yarnpkg.com/buble/-/buble-0.19.8.tgz"; - sha1 = "d642f0081afab66dccd897d7b6360d94030b9d3d"; - }; - } - { - name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; - path = fetchurl { - name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"; - sha1 = "bd7dc26ae2972d0eda253be061dba992349c19f0"; - }; - } - { - name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; - path = fetchurl { - name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz"; - sha1 = "890dd90d923a873e08e10e5fd51a57e5b7cce0ec"; + name = "browserslist___browserslist_4.14.7.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz"; + sha1 = "c071c1b3622c1c2e790799a37bb09473a4351cb6"; }; } { @@ -1786,14 +1906,6 @@ }; } { - name = "buffer_fill___buffer_fill_1.0.0.tgz"; - path = fetchurl { - name = "buffer_fill___buffer_fill_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz"; - sha1 = "f8f78b76789888ef39f205cd637f68e702122b2c"; - }; - } - { name = "buffer_from___buffer_from_1.1.1.tgz"; path = fetchurl { name = "buffer_from___buffer_from_1.1.1.tgz"; @@ -1818,14 +1930,6 @@ }; } { - name = "buffer___buffer_4.9.1.tgz"; - path = fetchurl { - name = "buffer___buffer_4.9.1.tgz"; - url = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz"; - sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; - }; - } - { name = "buffer___buffer_4.9.2.tgz"; path = fetchurl { name = "buffer___buffer_4.9.2.tgz"; @@ -1834,19 +1938,19 @@ }; } { - name = "buffer___buffer_5.4.3.tgz"; + name = "buffer___buffer_5.7.1.tgz"; path = fetchurl { - name = "buffer___buffer_5.4.3.tgz"; - url = "https://registry.yarnpkg.com/buffer/-/buffer-5.4.3.tgz"; - sha1 = "3fbc9c69eb713d323e3fc1a895eee0710c072115"; + name = "buffer___buffer_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; + sha1 = "ba62e7c13133053582197160851a8f648e99eed0"; }; } { - name = "bufferutil___bufferutil_4.0.1.tgz"; + name = "bufferutil___bufferutil_4.0.2.tgz"; path = fetchurl { - name = "bufferutil___bufferutil_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.1.tgz"; - sha1 = "3a177e8e5819a1243fe16b63a199951a7ad8d4a7"; + name = "bufferutil___bufferutil_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.2.tgz"; + sha1 = "79f68631910f6b993d870fc77dc0a2894eb96cd5"; }; } { @@ -1858,11 +1962,11 @@ }; } { - name = "bunyan___bunyan_1.8.12.tgz"; + name = "bunyan___bunyan_1.8.14.tgz"; path = fetchurl { - name = "bunyan___bunyan_1.8.12.tgz"; - url = "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.12.tgz"; - sha1 = "f150f0f6748abdd72aeae84f04403be2ef113797"; + name = "bunyan___bunyan_1.8.14.tgz"; + url = "https://registry.yarnpkg.com/bunyan/-/bunyan-1.8.14.tgz"; + sha1 = "3d8c1afea7de158a5238c7cb8a66ab6b38dd45b4"; }; } { @@ -1882,11 +1986,19 @@ }; } { - name = "cacache___cacache_12.0.3.tgz"; + name = "cacache___cacache_12.0.4.tgz"; + path = fetchurl { + name = "cacache___cacache_12.0.4.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz"; + sha1 = "668bcbd105aeb5f1d92fe25570ec9525c8faa40c"; + }; + } + { + name = "cacache___cacache_15.0.5.tgz"; path = fetchurl { - name = "cacache___cacache_12.0.3.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz"; - sha1 = "be99abba4e1bf5df461cd5a2c1071fc432573390"; + name = "cacache___cacache_15.0.5.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz"; + sha1 = "69162833da29170d6732334643c60e005f5f17d0"; }; } { @@ -1898,6 +2010,14 @@ }; } { + name = "call_bind___call_bind_1.0.0.tgz"; + path = fetchurl { + name = "call_bind___call_bind_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz"; + sha1 = "24127054bb3f9bdcb4b1fb82418186072f77b8ce"; + }; + } + { name = "caller_callsite___caller_callsite_2.0.0.tgz"; path = fetchurl { name = "caller_callsite___caller_callsite_2.0.0.tgz"; @@ -1946,11 +2066,11 @@ }; } { - name = "camelcase___camelcase_1.2.1.tgz"; + name = "camel_case___camel_case_4.1.1.tgz"; path = fetchurl { - name = "camelcase___camelcase_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + name = "camel_case___camel_case_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz"; + sha1 = "1fc41c854f00e2f7d0139dfeba1542d6896fe547"; }; } { @@ -1978,19 +2098,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001027.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001157.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001027.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001027.tgz"; - sha1 = "283e2ef17d94889cc216a22c6f85303d78ca852d"; - }; - } - { - name = "cardinal___cardinal_2.1.1.tgz"; - path = fetchurl { - name = "cardinal___cardinal_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/cardinal/-/cardinal-2.1.1.tgz"; - sha1 = "7cc1055d822d212954d07b085dea251cc7bc5505"; + name = "caniuse_lite___caniuse_lite_1.0.30001157.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz"; + sha1 = "2d11aaeb239b340bc1aa730eca18a37fdb07a9ab"; }; } { @@ -2002,11 +2114,19 @@ }; } { - name = "center_align___center_align_0.1.3.tgz"; + name = "ccount___ccount_1.1.0.tgz"; path = fetchurl { - name = "center_align___center_align_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz"; - sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; + name = "ccount___ccount_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz"; + sha1 = "246687debb6014735131be8abab2d93898f8d043"; + }; + } + { + name = "chalk___chalk_1.1.3.tgz"; + path = fetchurl { + name = "chalk___chalk_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; } { @@ -2018,11 +2138,11 @@ }; } { - name = "chalk___chalk_1.1.3.tgz"; + name = "chalk___chalk_3.0.0.tgz"; path = fetchurl { - name = "chalk___chalk_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + name = "chalk___chalk_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; + sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; }; } { @@ -2034,11 +2154,43 @@ }; } { - name = "chance___chance_1.1.4.tgz"; + name = "chance___chance_1.1.7.tgz"; path = fetchurl { - name = "chance___chance_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/chance/-/chance-1.1.4.tgz"; - sha1 = "d8743bf8e40bb05e024c305ca1ff441195eb23db"; + name = "chance___chance_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/chance/-/chance-1.1.7.tgz"; + sha1 = "e99dde5ac16681af787b5ba94c8277c090d6cfe8"; + }; + } + { + name = "character_entities_html4___character_entities_html4_1.1.4.tgz"; + path = fetchurl { + name = "character_entities_html4___character_entities_html4_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.4.tgz"; + sha1 = "0e64b0a3753ddbf1fdc044c5fd01d0199a02e125"; + }; + } + { + name = "character_entities_legacy___character_entities_legacy_1.1.4.tgz"; + path = fetchurl { + name = "character_entities_legacy___character_entities_legacy_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz"; + sha1 = "94bc1845dce70a5bb9d2ecc748725661293d8fc1"; + }; + } + { + name = "character_entities___character_entities_1.2.4.tgz"; + path = fetchurl { + name = "character_entities___character_entities_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz"; + sha1 = "e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b"; + }; + } + { + name = "character_reference_invalid___character_reference_invalid_1.1.4.tgz"; + path = fetchurl { + name = "character_reference_invalid___character_reference_invalid_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz"; + sha1 = "083329cda0eae272ab3dbbf37e9a382c13af1560"; }; } { @@ -2074,6 +2226,14 @@ }; } { + name = "chokidar___chokidar_3.4.3.tgz"; + path = fetchurl { + name = "chokidar___chokidar_3.4.3.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz"; + sha1 = "c1df38231448e45ca4ac588e6c79573ba6a57d5b"; + }; + } + { name = "chownr___chownr_1.1.4.tgz"; path = fetchurl { name = "chownr___chownr_1.1.4.tgz"; @@ -2082,6 +2242,14 @@ }; } { + name = "chownr___chownr_2.0.0.tgz"; + path = fetchurl { + name = "chownr___chownr_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz"; + sha1 = "15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"; + }; + } + { name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz"; path = fetchurl { name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz"; @@ -2114,6 +2282,14 @@ }; } { + name = "clean_stack___clean_stack_2.2.0.tgz"; + path = fetchurl { + name = "clean_stack___clean_stack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; + sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b"; + }; + } + { name = "cli_color___cli_color_1.4.0.tgz"; path = fetchurl { name = "cli_color___cli_color_1.4.0.tgz"; @@ -2130,27 +2306,19 @@ }; } { - name = "cli_width___cli_width_2.2.0.tgz"; - path = fetchurl { - name = "cli_width___cli_width_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz"; - sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; - }; - } - { - name = "clipboard___clipboard_2.0.4.tgz"; + name = "cli_width___cli_width_2.2.1.tgz"; path = fetchurl { - name = "clipboard___clipboard_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.4.tgz"; - sha1 = "836dafd66cf0fea5d71ce5d5b0bf6e958009112d"; + name = "cli_width___cli_width_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz"; + sha1 = "b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"; }; } { - name = "cliui___cliui_2.1.0.tgz"; + name = "clipboard___clipboard_2.0.6.tgz"; path = fetchurl { - name = "cliui___cliui_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz"; - sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; + name = "clipboard___clipboard_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz"; + sha1 = "52921296eec0fdf77ead1749421b21c968647376"; }; } { @@ -2178,6 +2346,14 @@ }; } { + name = "co___co_3.1.0.tgz"; + path = fetchurl { + name = "co___co_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/co/-/co-3.1.0.tgz"; + sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78"; + }; + } + { name = "coa___coa_2.0.2.tgz"; path = fetchurl { name = "coa___coa_2.0.2.tgz"; @@ -2198,9 +2374,9 @@ path = let repo = fetchgit { - url = "https://github.com/hackmdio/CodeMirror.git"; - rev = "2ac9b9f25707606b0c09b99decaf9d08dd434570"; - sha256 = "0aw6lixljaj0z8dbak0s60qfyk48qs747fw249qa4s9i6gb7f48v"; + url = "https://github.com/hedgedoc/CodeMirror.git"; + rev = "f780b569b3717cdff4c8507538cc63101bfa02e1"; + sha256 = "0b6axzi9kwsd24pcqfk5rmy9nhsdyklpd3z8w9wiynd64435dilz"; }; in runCommandNoCC "CodeMirror.git" { buildInputs = [gnutar]; } '' @@ -2210,6 +2386,14 @@ ''; } { + name = "collapse_white_space___collapse_white_space_1.0.6.tgz"; + path = fetchurl { + name = "collapse_white_space___collapse_white_space_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz"; + sha1 = "e63629c0016665792060dbbeb79c42239d2c5287"; + }; + } + { name = "collection_visit___collection_visit_1.0.0.tgz"; path = fetchurl { name = "collection_visit___collection_visit_1.0.0.tgz"; @@ -2226,6 +2410,14 @@ }; } { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { name = "color_name___color_name_1.1.3.tgz"; path = fetchurl { name = "color_name___color_name_1.1.3.tgz"; @@ -2242,11 +2434,11 @@ }; } { - name = "color_string___color_string_1.5.3.tgz"; + name = "color_string___color_string_1.5.4.tgz"; path = fetchurl { - name = "color_string___color_string_1.5.3.tgz"; - url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz"; - sha1 = "c9bbc5f01b58b5492f3d6857459cb6590ce204cc"; + name = "color_string___color_string_1.5.4.tgz"; + url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz"; + sha1 = "dd51cd25cfee953d138fe4002372cc3d0e504cb6"; }; } { @@ -2258,19 +2450,19 @@ }; } { - name = "color___color_3.1.2.tgz"; + name = "color___color_3.1.3.tgz"; path = fetchurl { - name = "color___color_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz"; - sha1 = "68148e7f85d41ad7649c5fa8c8106f098d229e10"; + name = "color___color_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz"; + sha1 = "ca67fb4e7b97d611dcde39eceed422067d91596e"; }; } { - name = "colornames___colornames_1.1.1.tgz"; + name = "colorette___colorette_1.2.1.tgz"; path = fetchurl { - name = "colornames___colornames_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/colornames/-/colornames-1.1.1.tgz"; - sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96"; + name = "colorette___colorette_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz"; + sha1 = "4d0b921325c14faf92633086a536db6e89564b1b"; }; } { @@ -2314,14 +2506,6 @@ }; } { - name = "commander___commander_3.0.2.tgz"; - path = fetchurl { - name = "commander___commander_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz"; - sha1 = "6837c3fb677ad9933d1cfba42dd14d5117d6b39e"; - }; - } - { name = "commander___commander_4.1.1.tgz"; path = fetchurl { name = "commander___commander_4.1.1.tgz"; @@ -2370,11 +2554,11 @@ }; } { - name = "compress_commons___compress_commons_1.2.2.tgz"; + name = "compress_commons___compress_commons_4.0.2.tgz"; path = fetchurl { - name = "compress_commons___compress_commons_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.2.tgz"; - sha1 = "524a9f10903f3a813389b0225d27c48bb751890f"; + name = "compress_commons___compress_commons_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.2.tgz"; + sha1 = "d6896be386e52f37610cef9e6fa5defc58c31bd7"; }; } { @@ -2410,6 +2594,14 @@ }; } { + name = "concat_stream___concat_stream_2.0.0.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz"; + sha1 = "414cf5af790a48c60ab9be4527d56d5e41133cb1"; + }; + } + { name = "config_chain___config_chain_1.1.12.tgz"; path = fetchurl { name = "config_chain___config_chain_1.1.12.tgz"; @@ -2498,11 +2690,11 @@ }; } { - name = "cookie_parser___cookie_parser_1.4.3.tgz"; + name = "cookie_parser___cookie_parser_1.4.5.tgz"; path = fetchurl { - name = "cookie_parser___cookie_parser_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.3.tgz"; - sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5"; + name = "cookie_parser___cookie_parser_1.4.5.tgz"; + url = "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.5.tgz"; + sha1 = "3e572d4b7c0c80f9c61daf604e4336831b5d1d49"; }; } { @@ -2530,6 +2722,14 @@ }; } { + name = "cookie___cookie_0.4.1.tgz"; + path = fetchurl { + name = "cookie___cookie_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz"; + sha1 = "afd713fe26ebd21ba95ceb61f9a8116e50a537d1"; + }; + } + { name = "cookiejar___cookiejar_2.0.6.tgz"; path = fetchurl { name = "cookiejar___cookiejar_2.0.6.tgz"; @@ -2538,6 +2738,14 @@ }; } { + name = "copy_anything___copy_anything_2.0.1.tgz"; + path = fetchurl { + name = "copy_anything___copy_anything_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.1.tgz"; + sha1 = "2afbce6da684bdfcbec93752fa762819cb480d9a"; + }; + } + { name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; path = fetchurl { name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; @@ -2554,11 +2762,11 @@ }; } { - name = "copy_webpack_plugin___copy_webpack_plugin_5.1.1.tgz"; + name = "copy_webpack_plugin___copy_webpack_plugin_6.4.1.tgz"; path = fetchurl { - name = "copy_webpack_plugin___copy_webpack_plugin_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz"; - sha1 = "5481a03dea1123d88a988c6ff8b78247214f0b88"; + name = "copy_webpack_plugin___copy_webpack_plugin_6.4.1.tgz"; + url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.4.1.tgz"; + sha1 = "138cd9b436dbca0a6d071720d5414848992ec47e"; }; } { @@ -2586,27 +2794,27 @@ }; } { - name = "crc32_stream___crc32_stream_2.0.0.tgz"; + name = "crc_32___crc_32_1.2.0.tgz"; path = fetchurl { - name = "crc32_stream___crc32_stream_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz"; - sha1 = "e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"; + name = "crc_32___crc_32_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz"; + sha1 = "cb2db6e29b88508e32d9dd0ec1693e7b41a18208"; }; } { - name = "crc___crc_3.8.0.tgz"; + name = "crc32_stream___crc32_stream_4.0.1.tgz"; path = fetchurl { - name = "crc___crc_3.8.0.tgz"; - url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz"; - sha1 = "ad60269c2c856f8c299e2c4cc0de4556914056c6"; + name = "crc32_stream___crc32_stream_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.1.tgz"; + sha1 = "0f047d74041737f8a55e86837a1b826bd8ab0067"; }; } { - name = "create_ecdh___create_ecdh_4.0.3.tgz"; + name = "create_ecdh___create_ecdh_4.0.4.tgz"; path = fetchurl { - name = "create_ecdh___create_ecdh_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz"; - sha1 = "c9111b6f33045c4697f144787f9254cdc77c45ff"; + name = "create_ecdh___create_ecdh_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz"; + sha1 = "d6e7f4bffa66736085a0762fd3a632684dabcc4e"; }; } { @@ -2642,14 +2850,6 @@ }; } { - name = "crypto_random_string___crypto_random_string_3.1.0.tgz"; - path = fetchurl { - name = "crypto_random_string___crypto_random_string_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-3.1.0.tgz"; - sha1 = "0368382de82e914179ad2ca9c7a788e260184bae"; - }; - } - { name = "css_b64_images___css_b64_images_0.2.5.tgz"; path = fetchurl { name = "css_b64_images___css_b64_images_0.2.5.tgz"; @@ -2674,11 +2874,11 @@ }; } { - name = "css_loader___css_loader_3.4.2.tgz"; + name = "css_loader___css_loader_3.6.0.tgz"; path = fetchurl { - name = "css_loader___css_loader_3.4.2.tgz"; - url = "https://registry.yarnpkg.com/css-loader/-/css-loader-3.4.2.tgz"; - sha1 = "d3fdb3358b43f233b78501c5ed7b1c6da6133202"; + name = "css_loader___css_loader_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz"; + sha1 = "2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645"; }; } { @@ -2714,11 +2914,11 @@ }; } { - name = "css_unit_converter___css_unit_converter_1.1.1.tgz"; + name = "css_tree___css_tree_1.0.1.tgz"; path = fetchurl { - name = "css_unit_converter___css_unit_converter_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz"; - sha1 = "d9b9281adcfd8ced935bdbaba83786897f64e996"; + name = "css_tree___css_tree_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.1.tgz"; + sha1 = "7726678dfe2a57993a018d9dce519bf1760e3b6d"; }; } { @@ -2730,19 +2930,11 @@ }; } { - name = "css_what___css_what_3.2.1.tgz"; - path = fetchurl { - name = "css_what___css_what_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/css-what/-/css-what-3.2.1.tgz"; - sha1 = "f4a8f12421064621b456755e34a03a2c22df5da1"; - }; - } - { - name = "cssesc___cssesc_2.0.0.tgz"; + name = "css_what___css_what_3.4.2.tgz"; path = fetchurl { - name = "cssesc___cssesc_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz"; - sha1 = "3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"; + name = "css_what___css_what_3.4.2.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz"; + sha1 = "ea7026fcb01777edbde52124e21f327e7ae950e4"; }; } { @@ -2810,11 +3002,11 @@ }; } { - name = "csso___csso_4.0.2.tgz"; + name = "csso___csso_4.1.0.tgz"; path = fetchurl { - name = "csso___csso_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/csso/-/csso-4.0.2.tgz"; - sha1 = "e5f81ab3a56b8eefb7f0092ce7279329f454de3d"; + name = "csso___csso_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/csso/-/csso-4.1.0.tgz"; + sha1 = "1d31193efa99b87aa6bad6c0cef155e543d09e8b"; }; } { @@ -2874,11 +3066,11 @@ }; } { - name = "d3_brush___d3_brush_1.1.5.tgz"; + name = "d3_brush___d3_brush_1.1.6.tgz"; path = fetchurl { - name = "d3_brush___d3_brush_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.5.tgz"; - sha1 = "066b8e84d17b192986030446c97c0fba7e1bacdc"; + name = "d3_brush___d3_brush_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.6.tgz"; + sha1 = "b0a22c7372cabec128bdddf9bddc058592f89e9b"; }; } { @@ -2898,11 +3090,11 @@ }; } { - name = "d3_color___d3_color_1.4.0.tgz"; + name = "d3_color___d3_color_1.4.1.tgz"; path = fetchurl { - name = "d3_color___d3_color_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.0.tgz"; - sha1 = "89c45a995ed773b13314f06460df26d60ba0ecaf"; + name = "d3_color___d3_color_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz"; + sha1 = "c52002bf8846ada4424d55d97982fef26eb3bc8a"; }; } { @@ -2938,19 +3130,19 @@ }; } { - name = "d3_ease___d3_ease_1.0.6.tgz"; + name = "d3_ease___d3_ease_1.0.7.tgz"; path = fetchurl { - name = "d3_ease___d3_ease_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.6.tgz"; - sha1 = "ebdb6da22dfac0a22222f2d4da06f66c416a0ec0"; + name = "d3_ease___d3_ease_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.7.tgz"; + sha1 = "9a834890ef8b8ae8c558b2fe55bd57f5993b85e2"; }; } { - name = "d3_fetch___d3_fetch_1.1.2.tgz"; + name = "d3_fetch___d3_fetch_1.2.0.tgz"; path = fetchurl { - name = "d3_fetch___d3_fetch_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.1.2.tgz"; - sha1 = "957c8fbc6d4480599ba191b1b2518bf86b3e1be2"; + name = "d3_fetch___d3_fetch_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.2.0.tgz"; + sha1 = "15ce2ecfc41b092b1db50abd2c552c2316cf7fc7"; }; } { @@ -2962,19 +3154,19 @@ }; } { - name = "d3_format___d3_format_1.4.3.tgz"; + name = "d3_format___d3_format_1.4.5.tgz"; path = fetchurl { - name = "d3_format___d3_format_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.3.tgz"; - sha1 = "4e8eb4dff3fdcb891a8489ec6e698601c41b96f1"; + name = "d3_format___d3_format_1.4.5.tgz"; + url = "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz"; + sha1 = "374f2ba1320e3717eb74a9356c67daee17a7edb4"; }; } { - name = "d3_geo___d3_geo_1.11.9.tgz"; + name = "d3_geo___d3_geo_1.12.1.tgz"; path = fetchurl { - name = "d3_geo___d3_geo_1.11.9.tgz"; - url = "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.11.9.tgz"; - sha1 = "77eaed14ba62fc2c0aef55cd2943849c866f7ae6"; + name = "d3_geo___d3_geo_1.12.1.tgz"; + url = "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.12.1.tgz"; + sha1 = "7fc2ab7414b72e59fbcbd603e80d9adc029b035f"; }; } { @@ -3042,11 +3234,11 @@ }; } { - name = "d3_selection___d3_selection_1.4.1.tgz"; + name = "d3_selection___d3_selection_1.4.2.tgz"; path = fetchurl { - name = "d3_selection___d3_selection_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.1.tgz"; - sha1 = "98eedbbe085fbda5bafa2f9e3f3a2f4d7d622a98"; + name = "d3_selection___d3_selection_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz"; + sha1 = "dcaa49522c0dbf32d6c1858afc26b6094555bc5c"; }; } { @@ -3058,11 +3250,11 @@ }; } { - name = "d3_time_format___d3_time_format_2.2.3.tgz"; + name = "d3_time_format___d3_time_format_2.3.0.tgz"; path = fetchurl { - name = "d3_time_format___d3_time_format_2.2.3.tgz"; - url = "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.2.3.tgz"; - sha1 = "0c9a12ee28342b2037e5ea1cf0b9eb4dd75f29cb"; + name = "d3_time_format___d3_time_format_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.3.0.tgz"; + sha1 = "107bdc028667788a8924ba040faf1fbccd5a7850"; }; } { @@ -3106,11 +3298,11 @@ }; } { - name = "d3___d3_5.15.0.tgz"; + name = "d3___d3_5.16.0.tgz"; path = fetchurl { - name = "d3___d3_5.15.0.tgz"; - url = "https://registry.yarnpkg.com/d3/-/d3-5.15.0.tgz"; - sha1 = "ffd44958e6a3cb8a59a84429c45429b8bca5677a"; + name = "d3___d3_5.16.0.tgz"; + url = "https://registry.yarnpkg.com/d3/-/d3-5.16.0.tgz"; + sha1 = "9c5e8d3b56403c79d4ed42fbd62f6113f199c877"; }; } { @@ -3170,14 +3362,6 @@ }; } { - name = "debug___debug_4.1.1.tgz"; - path = fetchurl { - name = "debug___debug_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; - sha1 = "3b72260255109c6b589cee050f1d516139664791"; - }; - } - { name = "debug___debug_2.6.9.tgz"; path = fetchurl { name = "debug___debug_2.6.9.tgz"; @@ -3202,6 +3386,30 @@ }; } { + name = "debug___debug_4.2.0.tgz"; + path = fetchurl { + name = "debug___debug_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz"; + sha1 = "7f150f93920e94c58f5574c2fd01a3110effe7f1"; + }; + } + { + name = "debug___debug_4.3.1.tgz"; + path = fetchurl { + name = "debug___debug_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; + sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; + }; + } + { + name = "debug___debug_4.1.1.tgz"; + path = fetchurl { + name = "debug___debug_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; + sha1 = "3b72260255109c6b589cee050f1d516139664791"; + }; + } + { name = "decamelize___decamelize_1.2.0.tgz"; path = fetchurl { name = "decamelize___decamelize_1.2.0.tgz"; @@ -3378,21 +3586,13 @@ }; } { - name = "diagnostics___diagnostics_1.1.1.tgz"; - path = fetchurl { - name = "diagnostics___diagnostics_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz"; - sha1 = "cab6ac33df70c9d9a727490ae43ac995a769b22a"; - }; - } - { name = "diff-match-patch.git"; path = let repo = fetchgit { url = "https://github.com/hackmdio/diff-match-patch.git"; - rev = "5b73bb82454a81ecdbdb81afb4bea4c36132fbaa"; - sha256 = "0awiyanl31n7n8ipx5yri713yvk6i692gphgvcr2nm9rr57hn6i7"; + rev = "c2f8fb9d69aa9490b764850aa86ba442c93ccf78"; + sha256 = "0hlv66cxrqih7spnissl44jd8f8x9dyvzc68fn0g2fwwrnpjjib7"; }; in runCommandNoCC "diff-match-patch.git" { buildInputs = [gnutar]; } '' @@ -3418,19 +3618,11 @@ }; } { - name = "dir_glob___dir_glob_2.2.2.tgz"; - path = fetchurl { - name = "dir_glob___dir_glob_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz"; - sha1 = "fa09f0694153c8918b18ba0deafae94769fc50c4"; - }; - } - { - name = "dns_prefetch_control___dns_prefetch_control_0.2.0.tgz"; + name = "dir_glob___dir_glob_3.0.1.tgz"; path = fetchurl { - name = "dns_prefetch_control___dns_prefetch_control_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/dns-prefetch-control/-/dns-prefetch-control-0.2.0.tgz"; - sha1 = "73988161841f3dcc81f47686d539a2c702c88624"; + name = "dir_glob___dir_glob_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz"; + sha1 = "56dbf73d992a4a93ba1584f4534063fd2e41717f"; }; } { @@ -3490,11 +3682,11 @@ }; } { - name = "domelementtype___domelementtype_2.0.1.tgz"; + name = "domelementtype___domelementtype_2.0.2.tgz"; path = fetchurl { - name = "domelementtype___domelementtype_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz"; - sha1 = "1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"; + name = "domelementtype___domelementtype_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz"; + sha1 = "f3b6e549201e46f588b59463dd77187131fe6971"; }; } { @@ -3538,11 +3730,19 @@ }; } { - name = "dot_prop___dot_prop_5.2.0.tgz"; + name = "dot_case___dot_case_3.0.3.tgz"; path = fetchurl { - name = "dot_prop___dot_prop_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz"; - sha1 = "c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"; + name = "dot_case___dot_case_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz"; + sha1 = "21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"; + }; + } + { + name = "dot_prop___dot_prop_5.3.0.tgz"; + path = fetchurl { + name = "dot_prop___dot_prop_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; + sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"; }; } { @@ -3562,14 +3762,6 @@ }; } { - name = "duplexer___duplexer_0.1.1.tgz"; - path = fetchurl { - name = "duplexer___duplexer_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz"; - sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; - }; - } - { name = "duplexify___duplexify_3.7.1.tgz"; path = fetchurl { name = "duplexify___duplexify_3.7.1.tgz"; @@ -3618,19 +3810,19 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.352.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.596.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.352.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.352.tgz"; - sha1 = "f0fc1e561104dbfba55cb3d45cad3626dc75d7e9"; + name = "electron_to_chromium___electron_to_chromium_1.3.596.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.596.tgz"; + sha1 = "c7ed98512c7ff36ddcbfed9e54e6355335c35257"; }; } { - name = "elliptic___elliptic_6.5.2.tgz"; + name = "elliptic___elliptic_6.5.3.tgz"; path = fetchurl { - name = "elliptic___elliptic_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz"; - sha1 = "05c5678d7173c049d8ca433552224a495d0e3762"; + name = "elliptic___elliptic_6.5.3.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz"; + sha1 = "cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"; }; } { @@ -3642,6 +3834,14 @@ }; } { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + }; + } + { name = "emojify.js___emojify.js_1.1.0.tgz"; path = fetchurl { name = "emojify.js___emojify.js_1.1.0.tgz"; @@ -3650,19 +3850,19 @@ }; } { - name = "emojis_list___emojis_list_2.1.0.tgz"; + name = "emojis_list___emojis_list_3.0.0.tgz"; path = fetchurl { - name = "emojis_list___emojis_list_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz"; - sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; + name = "emojis_list___emojis_list_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz"; + sha1 = "5570662046ad29e2e916e71aae260abdff4f6a78"; }; } { - name = "enabled___enabled_1.0.2.tgz"; + name = "enabled___enabled_2.0.0.tgz"; path = fetchurl { - name = "enabled___enabled_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz"; - sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93"; + name = "enabled___enabled_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz"; + sha1 = "f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2"; }; } { @@ -3682,43 +3882,35 @@ }; } { - name = "engine.io_client___engine.io_client_3.2.1.tgz"; - path = fetchurl { - name = "engine.io_client___engine.io_client_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz"; - sha1 = "6f54c0475de487158a1a7c77d10178708b6add36"; - }; - } - { - name = "engine.io_parser___engine.io_parser_2.1.3.tgz"; + name = "engine.io_client___engine.io_client_3.4.4.tgz"; path = fetchurl { - name = "engine.io_parser___engine.io_parser_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.3.tgz"; - sha1 = "757ab970fbf2dfb32c7b74b033216d5739ef79a6"; + name = "engine.io_client___engine.io_client_3.4.4.tgz"; + url = "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.4.tgz"; + sha1 = "77d8003f502b0782dd792b073a4d2cf7ca5ab967"; }; } { - name = "engine.io___engine.io_3.2.1.tgz"; + name = "engine.io_parser___engine.io_parser_2.2.1.tgz"; path = fetchurl { - name = "engine.io___engine.io_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.1.tgz"; - sha1 = "b60281c35484a70ee0351ea0ebff83ec8c9522a2"; + name = "engine.io_parser___engine.io_parser_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz"; + sha1 = "57ce5611d9370ee94f99641b589f94c97e4f5da7"; }; } { - name = "enhanced_resolve___enhanced_resolve_4.1.0.tgz"; + name = "engine.io___engine.io_3.4.2.tgz"; path = fetchurl { - name = "enhanced_resolve___enhanced_resolve_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz"; - sha1 = "41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"; + name = "engine.io___engine.io_3.4.2.tgz"; + url = "https://registry.yarnpkg.com/engine.io/-/engine.io-3.4.2.tgz"; + sha1 = "8fc84ee00388e3e228645e0a7d3dfaeed5bd122c"; }; } { - name = "enhanced_resolve___enhanced_resolve_4.1.1.tgz"; + name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz"; path = fetchurl { - name = "enhanced_resolve___enhanced_resolve_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz"; - sha1 = "2937e2b8066cd0fe7ce0990a98f0d71a35189f66"; + name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz"; + sha1 = "3b806f3bfafc1ec7de69551ef93cca46c1704126"; }; } { @@ -3730,19 +3922,27 @@ }; } { - name = "entities___entities_2.0.0.tgz"; + name = "entities___entities_2.1.0.tgz"; path = fetchurl { - name = "entities___entities_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz"; - sha1 = "68d6084cab1b079767540d80e56a39b423e4abf4"; + name = "entities___entities_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz"; + sha1 = "992d3129cf7df6870b96c57858c249a120f8b8b5"; }; } { - name = "env_variable___env_variable_0.0.6.tgz"; + name = "entities___entities_2.0.3.tgz"; path = fetchurl { - name = "env_variable___env_variable_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.6.tgz"; - sha1 = "74ab20b3786c545b62b4a4813ab8cf22726c9808"; + name = "entities___entities_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz"; + sha1 = "5c487e5742ab93c15abb5da22759b8590ec03b7f"; + }; + } + { + name = "entity_decode___entity_decode_2.0.2.tgz"; + path = fetchurl { + name = "entity_decode___entity_decode_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/entity-decode/-/entity-decode-2.0.2.tgz"; + sha1 = "e4f807e52c3294246e9347d1f2b02b07fd5f92e7"; }; } { @@ -3762,11 +3962,19 @@ }; } { - name = "es_abstract___es_abstract_1.17.4.tgz"; + name = "es_abstract___es_abstract_1.17.7.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.17.7.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz"; + sha1 = "a4de61b2f66989fc7421676c1cb9787573ace54c"; + }; + } + { + name = "es_abstract___es_abstract_1.18.0_next.1.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.17.4.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz"; - sha1 = "e3aedf19706b20e7c2594c35fc0d57605a79e184"; + name = "es_abstract___es_abstract_1.18.0_next.1.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz"; + sha1 = "6e3a0a4bda717e5023ab3b8e90bec36108d22c68"; }; } { @@ -3802,14 +4010,6 @@ }; } { - name = "es6_promise___es6_promise_4.2.8.tgz"; - path = fetchurl { - name = "es6_promise___es6_promise_4.2.8.tgz"; - url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz"; - sha1 = "4eb21594c972bc40553d276e510539143db53e0a"; - }; - } - { name = "es6_symbol___es6_symbol_3.1.3.tgz"; path = fetchurl { name = "es6_symbol___es6_symbol_3.1.3.tgz"; @@ -3826,6 +4026,14 @@ }; } { + name = "escalade___escalade_3.1.1.tgz"; + path = fetchurl { + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + }; + } + { name = "escape_html___escape_html_1.0.3.tgz"; path = fetchurl { name = "escape_html___escape_html_1.0.3.tgz"; @@ -3842,19 +4050,11 @@ }; } { - name = "escaper___escaper_2.5.3.tgz"; - path = fetchurl { - name = "escaper___escaper_2.5.3.tgz"; - url = "https://registry.yarnpkg.com/escaper/-/escaper-2.5.3.tgz"; - sha1 = "8b8fe90ba364054151ab7eff18b4ce43b1e13ab5"; - }; - } - { - name = "escodegen___escodegen_1.14.1.tgz"; + name = "escodegen___escodegen_1.14.3.tgz"; path = fetchurl { - name = "escodegen___escodegen_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz"; - sha1 = "ba01d0c8278b5e95a9a45350142026659027a457"; + name = "escodegen___escodegen_1.14.3.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz"; + sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503"; }; } { @@ -3866,19 +4066,19 @@ }; } { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; path = fetchurl { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz"; - sha1 = "dbaa52b6b2816b50bc6711af75422de808e98404"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; + sha1 = "85ffa81942c25012d8231096ddf679c03042c717"; }; } { - name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz"; + name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz"; - sha1 = "7878f7504824e1b857dd2505b59a8e5eda26a708"; + name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; + sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6"; }; } { @@ -3890,11 +4090,11 @@ }; } { - name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz"; + name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz"; path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz"; - sha1 = "802423196dcb11d9ce8435a5fc02a6d3b46939b3"; + name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz"; + sha1 = "0896c7e6a0cf44109a2d97b95903c2bb689d7702"; }; } { @@ -3914,11 +4114,11 @@ }; } { - name = "eslint_plugin_standard___eslint_plugin_standard_4.0.1.tgz"; + name = "eslint_plugin_standard___eslint_plugin_standard_4.1.0.tgz"; path = fetchurl { - name = "eslint_plugin_standard___eslint_plugin_standard_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz"; - sha1 = "ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4"; + name = "eslint_plugin_standard___eslint_plugin_standard_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.1.0.tgz"; + sha1 = "0c3bf3a67e853f8bbbc580fb4945fbf16f41b7c5"; }; } { @@ -3938,11 +4138,11 @@ }; } { - name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; - sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2"; + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e"; }; } { @@ -3970,19 +4170,19 @@ }; } { - name = "esquery___esquery_1.1.0.tgz"; + name = "esquery___esquery_1.3.1.tgz"; path = fetchurl { - name = "esquery___esquery_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz"; - sha1 = "c5c0b66f383e7656404f86b31334d72524eddb48"; + name = "esquery___esquery_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; + sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; }; } { - name = "esrecurse___esrecurse_4.2.1.tgz"; + name = "esrecurse___esrecurse_4.3.0.tgz"; path = fetchurl { - name = "esrecurse___esrecurse_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz"; - sha1 = "007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"; + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; }; } { @@ -3994,11 +4194,11 @@ }; } { - name = "estree_walker___estree_walker_0.6.1.tgz"; + name = "estraverse___estraverse_5.2.0.tgz"; path = fetchurl { - name = "estree_walker___estree_walker_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz"; - sha1 = "53049143f40c6eb918b23671d1fe3219f3a1b362"; + name = "estraverse___estraverse_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; + sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; }; } { @@ -4026,11 +4226,11 @@ }; } { - name = "eve___eve_0.4.2.tgz"; + name = "eve___eve_0.5.4.tgz"; path = fetchurl { - name = "eve___eve_0.4.2.tgz"; - url = "https://registry.yarnpkg.com/eve/-/eve-0.4.2.tgz"; - sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae"; + name = "eve___eve_0.5.4.tgz"; + url = "https://registry.yarnpkg.com/eve/-/eve-0.5.4.tgz"; + sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa"; }; } { @@ -4050,11 +4250,11 @@ }; } { - name = "events___events_3.1.0.tgz"; + name = "events___events_3.2.0.tgz"; path = fetchurl { - name = "events___events_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz"; - sha1 = "84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"; + name = "events___events_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz"; + sha1 = "93b87c18f8efcd4202a461aec4dfc0556b639379"; }; } { @@ -4066,11 +4266,11 @@ }; } { - name = "execa___execa_1.0.0.tgz"; + name = "exit_on_epipe___exit_on_epipe_1.0.1.tgz"; path = fetchurl { - name = "execa___execa_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; - sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; + name = "exit_on_epipe___exit_on_epipe_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"; + sha1 = "0bdd92e87d5285d267daa8171d0eb06159689692"; }; } { @@ -4106,14 +4306,6 @@ }; } { - name = "expect_ct___expect_ct_0.2.0.tgz"; - path = fetchurl { - name = "expect_ct___expect_ct_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/expect-ct/-/expect-ct-0.2.0.tgz"; - sha1 = "3a54741b6ed34cc7a93305c605f63cd268a54a62"; - }; - } - { name = "expose_loader___expose_loader_0.7.5.tgz"; path = fetchurl { name = "expose_loader___expose_loader_0.7.5.tgz"; @@ -4122,11 +4314,11 @@ }; } { - name = "express_session___express_session_1.17.0.tgz"; + name = "express_session___express_session_1.17.1.tgz"; path = fetchurl { - name = "express_session___express_session_1.17.0.tgz"; - url = "https://registry.yarnpkg.com/express-session/-/express-session-1.17.0.tgz"; - sha1 = "9b50dbb5e8a03c3537368138f072736150b7f9b3"; + name = "express_session___express_session_1.17.1.tgz"; + url = "https://registry.yarnpkg.com/express-session/-/express-session-1.17.1.tgz"; + sha1 = "36ecbc7034566d38c8509885c044d461c11bf357"; }; } { @@ -4202,14 +4394,6 @@ }; } { - name = "extract_zip___extract_zip_1.6.7.tgz"; - path = fetchurl { - name = "extract_zip___extract_zip_1.6.7.tgz"; - url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz"; - sha1 = "a840b4b8af6403264c8db57f4f1a74333ef81fe9"; - }; - } - { name = "extsprintf___extsprintf_1.2.0.tgz"; path = fetchurl { name = "extsprintf___extsprintf_1.2.0.tgz"; @@ -4234,11 +4418,19 @@ }; } { - name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + }; + } + { + name = "fast_glob___fast_glob_3.2.4.tgz"; path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; - sha1 = "545145077c501491e33b15ec408c294376e94ae4"; + name = "fast_glob___fast_glob_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz"; + sha1 = "d20aefbf99579383e7f3cc66529158c9b98554d3"; }; } { @@ -4266,11 +4458,19 @@ }; } { - name = "fd_slicer___fd_slicer_1.0.1.tgz"; + name = "fastq___fastq_1.9.0.tgz"; + path = fetchurl { + name = "fastq___fastq_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.9.0.tgz"; + sha1 = "e16a72f338eaca48e91b5c23593bcc2ef66b7947"; + }; + } + { + name = "fault___fault_1.0.4.tgz"; path = fetchurl { - name = "fd_slicer___fd_slicer_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz"; - sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; + name = "fault___fault_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/fault/-/fault-1.0.4.tgz"; + sha1 = "eafcfc0a6d214fc94601e170df29954a4f842f13"; }; } { @@ -4282,19 +4482,19 @@ }; } { - name = "fecha___fecha_2.3.3.tgz"; + name = "fecha___fecha_4.2.0.tgz"; path = fetchurl { - name = "fecha___fecha_2.3.3.tgz"; - url = "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz"; - sha1 = "948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"; + name = "fecha___fecha_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/fecha/-/fecha-4.2.0.tgz"; + sha1 = "3ffb6395453e3f3efff850404f0a59b6747f5f41"; }; } { - name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; path = fetchurl { - name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz"; - sha1 = "862470112901c727a0e495a80744bd5baa1d6790"; + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; + sha1 = "b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"; }; } { @@ -4306,6 +4506,14 @@ }; } { + name = "figures___figures_3.2.0.tgz"; + path = fetchurl { + name = "figures___figures_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz"; + sha1 = "625c18bd293c604dc4a8ddb2febf0c88341746af"; + }; + } + { name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; path = fetchurl { name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; @@ -4330,6 +4538,14 @@ }; } { + name = "file_type___file_type_16.1.0.tgz"; + path = fetchurl { + name = "file_type___file_type_16.1.0.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-16.1.0.tgz"; + sha1 = "1c8a4458b2103e07d2b49ae7f76384abafe86529"; + }; + } + { name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; path = fetchurl { name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; @@ -4362,6 +4578,14 @@ }; } { + name = "fill_range___fill_range_7.0.1.tgz"; + path = fetchurl { + name = "fill_range___fill_range_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; + sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + }; + } + { name = "finalhandler___finalhandler_1.1.2.tgz"; path = fetchurl { name = "finalhandler___finalhandler_1.1.2.tgz"; @@ -4386,6 +4610,14 @@ }; } { + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; + path = fetchurl { + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; + sha1 = "89b33fad4a4670daa94f855f7fbe31d6d84fe880"; + }; + } + { name = "find_up___find_up_2.1.0.tgz"; path = fetchurl { name = "find_up___find_up_2.1.0.tgz"; @@ -4402,6 +4634,14 @@ }; } { + name = "find_up___find_up_4.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + }; + } + { name = "findup_sync___findup_sync_3.0.0.tgz"; path = fetchurl { name = "findup_sync___findup_sync_3.0.0.tgz"; @@ -4418,19 +4658,19 @@ }; } { - name = "flatted___flatted_2.0.1.tgz"; + name = "flatted___flatted_2.0.2.tgz"; path = fetchurl { - name = "flatted___flatted_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz"; - sha1 = "69e57caa8f0eacbc281d2e2cb458d46fdb449e08"; + name = "flatted___flatted_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz"; + sha1 = "4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"; }; } { - name = "flowchart.js___flowchart.js_1.13.0.tgz"; + name = "flowchart.js___flowchart.js_1.15.0.tgz"; path = fetchurl { - name = "flowchart.js___flowchart.js_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/flowchart.js/-/flowchart.js-1.13.0.tgz"; - sha1 = "fd966270bd310ddefb168d6826c792c5f345372f"; + name = "flowchart.js___flowchart.js_1.15.0.tgz"; + url = "https://registry.yarnpkg.com/flowchart.js/-/flowchart.js-1.15.0.tgz"; + sha1 = "132ba2df14af0a65e67280026ef05a1ffd16569f"; }; } { @@ -4442,6 +4682,14 @@ }; } { + name = "fn.name___fn.name_1.1.0.tgz"; + path = fetchurl { + name = "fn.name___fn.name_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz"; + sha1 = "26cad8017967aea8731bc42961d04a3d5988accc"; + }; + } + { name = "follow_redirects___follow_redirects_1.5.10.tgz"; path = fetchurl { name = "follow_redirects___follow_redirects_1.5.10.tgz"; @@ -4506,11 +4754,19 @@ }; } { - name = "formidable___formidable_1.2.1.tgz"; + name = "format___format_0.2.2.tgz"; path = fetchurl { - name = "formidable___formidable_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/formidable/-/formidable-1.2.1.tgz"; - sha1 = "70fb7ca0290ee6ff961090415f4b3df3d2082659"; + name = "format___format_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz"; + sha1 = "d6170107e9efdc4ed30c9dc39016df942b5cb58b"; + }; + } + { + name = "formidable___formidable_1.2.2.tgz"; + path = fetchurl { + name = "formidable___formidable_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/formidable/-/formidable-1.2.2.tgz"; + sha1 = "bf69aea2972982675f00865342b982986f6b8dd9"; }; } { @@ -4538,14 +4794,6 @@ }; } { - name = "frameguard___frameguard_3.1.0.tgz"; - path = fetchurl { - name = "frameguard___frameguard_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/frameguard/-/frameguard-3.1.0.tgz"; - sha1 = "bd1442cca1d67dc346a6751559b6d04502103a22"; - }; - } - { name = "fresh___fresh_0.5.2.tgz"; path = fetchurl { name = "fresh___fresh_0.5.2.tgz"; @@ -4570,14 +4818,6 @@ }; } { - name = "fs_extra___fs_extra_1.0.0.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz"; - sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; - }; - } - { name = "fs_extra___fs_extra_7.0.1.tgz"; path = fetchurl { name = "fs_extra___fs_extra_7.0.1.tgz"; @@ -4594,6 +4834,14 @@ }; } { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha1 = "7f5036fdbf12c63c169190cbe4199c852271f9fb"; + }; + } + { name = "fs_readdir_recursive___fs_readdir_recursive_1.1.0.tgz"; path = fetchurl { name = "fs_readdir_recursive___fs_readdir_recursive_1.1.0.tgz"; @@ -4618,11 +4866,19 @@ }; } { - name = "fsevents___fsevents_1.2.11.tgz"; + name = "fsevents___fsevents_1.2.13.tgz"; path = fetchurl { - name = "fsevents___fsevents_1.2.11.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz"; - sha1 = "67bf57f4758f02ede88fb2a1712fef4d15358be3"; + name = "fsevents___fsevents_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz"; + sha1 = "f325cb0455592428bcf11b383370ef70e3bfcc38"; + }; + } + { + name = "fsevents___fsevents_2.1.3.tgz"; + path = fetchurl { + name = "fsevents___fsevents_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz"; + sha1 = "fb738703ae8d2f9fe900c33836ddebee8b97f23e"; }; } { @@ -4674,11 +4930,11 @@ }; } { - name = "get_stream___get_stream_4.1.0.tgz"; + name = "get_intrinsic___get_intrinsic_1.0.1.tgz"; path = fetchurl { - name = "get_stream___get_stream_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; - sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; + name = "get_intrinsic___get_intrinsic_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz"; + sha1 = "94a9768fcbdd0595a1c9273aacf4c89d075631be"; }; } { @@ -4730,6 +4986,14 @@ }; } { + name = "glob_parent___glob_parent_5.1.1.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; + sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; + }; + } + { name = "glob___glob_7.1.2.tgz"; path = fetchurl { name = "glob___glob_7.1.2.tgz"; @@ -4754,14 +5018,6 @@ }; } { - name = "global_modules___global_modules_2.0.0.tgz"; - path = fetchurl { - name = "global_modules___global_modules_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz"; - sha1 = "997605ad2345f27f51539bea26574421215c7780"; - }; - } - { name = "global_modules___global_modules_1.0.0.tgz"; path = fetchurl { name = "global_modules___global_modules_1.0.0.tgz"; @@ -4770,6 +5026,14 @@ }; } { + name = "global_modules___global_modules_2.0.0.tgz"; + path = fetchurl { + name = "global_modules___global_modules_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz"; + sha1 = "997605ad2345f27f51539bea26574421215c7780"; + }; + } + { name = "global_prefix___global_prefix_1.0.2.tgz"; path = fetchurl { name = "global_prefix___global_prefix_1.0.2.tgz"; @@ -4802,11 +5066,11 @@ }; } { - name = "globby___globby_7.1.1.tgz"; + name = "globby___globby_11.0.1.tgz"; path = fetchurl { - name = "globby___globby_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz"; - sha1 = "fb2ccff9401f8600945dfada97440cca972b8680"; + name = "globby___globby_11.0.1.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz"; + sha1 = "9a2bf107a068f3ffeabc49ad702c79ede8cfd357"; }; } { @@ -4818,11 +5082,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.3.tgz"; + name = "graceful_fs___graceful_fs_4.2.4.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha1 = "4a12ff1b60376ef09862c2093edd908328be8423"; + name = "graceful_fs___graceful_fs_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; }; } { @@ -4842,11 +5106,11 @@ }; } { - name = "handlebars___handlebars_4.7.3.tgz"; + name = "handlebars___handlebars_4.7.6.tgz"; path = fetchurl { - name = "handlebars___handlebars_4.7.3.tgz"; - url = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.3.tgz"; - sha1 = "8ece2797826886cf8082d1726ff21d2a022550ee"; + name = "handlebars___handlebars_4.7.6.tgz"; + url = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz"; + sha1 = "d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"; }; } { @@ -4858,11 +5122,11 @@ }; } { - name = "har_validator___har_validator_5.1.3.tgz"; + name = "har_validator___har_validator_5.1.5.tgz"; path = fetchurl { - name = "har_validator___har_validator_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz"; - sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080"; + name = "har_validator___har_validator_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz"; + sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"; }; } { @@ -4906,6 +5170,14 @@ }; } { + name = "has_flag___has_flag_4.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + }; + } + { name = "has_symbols___has_symbols_1.0.1.tgz"; path = fetchurl { name = "has_symbols___has_symbols_1.0.1.tgz"; @@ -4962,11 +5234,11 @@ }; } { - name = "hash_base___hash_base_3.0.4.tgz"; + name = "hash_base___hash_base_3.1.0.tgz"; path = fetchurl { - name = "hash_base___hash_base_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz"; - sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; + name = "hash_base___hash_base_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz"; + sha1 = "55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"; }; } { @@ -4978,14 +5250,6 @@ }; } { - name = "hasha___hasha_2.2.0.tgz"; - path = fetchurl { - name = "hasha___hasha_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/hasha/-/hasha-2.2.0.tgz"; - sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; - }; - } - { name = "he___he_1.1.1.tgz"; path = fetchurl { name = "he___he_1.1.1.tgz"; @@ -5010,19 +5274,19 @@ }; } { - name = "helmet_csp___helmet_csp_2.9.4.tgz"; + name = "helmet_csp___helmet_csp_2.10.0.tgz"; path = fetchurl { - name = "helmet_csp___helmet_csp_2.9.4.tgz"; - url = "https://registry.yarnpkg.com/helmet-csp/-/helmet-csp-2.9.4.tgz"; - sha1 = "801382bac98f2f88706dc5c89d95c7e31af3a4a9"; + name = "helmet_csp___helmet_csp_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/helmet-csp/-/helmet-csp-2.10.0.tgz"; + sha1 = "685dde1747bc16c5e28ad9d91e229a69f0a85e84"; }; } { - name = "helmet___helmet_3.21.2.tgz"; + name = "helmet___helmet_3.23.3.tgz"; path = fetchurl { - name = "helmet___helmet_3.21.2.tgz"; - url = "https://registry.yarnpkg.com/helmet/-/helmet-3.21.2.tgz"; - sha1 = "7e2a19d5f6d898a77b5d2858e8e4bb2cda59f19f"; + name = "helmet___helmet_3.23.3.tgz"; + url = "https://registry.yarnpkg.com/helmet/-/helmet-3.23.3.tgz"; + sha1 = "5ba30209c5f73ded4ab65746a3a11bedd4579ab7"; }; } { @@ -5042,19 +5306,11 @@ }; } { - name = "highlight.js___highlight.js_9.18.1.tgz"; - path = fetchurl { - name = "highlight.js___highlight.js_9.18.1.tgz"; - url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz"; - sha1 = "ed21aa001fe6252bb10a3d76d47573c6539fe13c"; - }; - } - { - name = "highlight.js___highlight.js_9.12.0.tgz"; + name = "highlight.js___highlight.js_9.18.5.tgz"; path = fetchurl { - name = "highlight.js___highlight.js_9.12.0.tgz"; - url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz"; - sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e"; + name = "highlight.js___highlight.js_9.18.5.tgz"; + url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz"; + sha1 = "d18a359867f378c138d6819edfc2a8acd5f29825"; }; } { @@ -5082,11 +5338,11 @@ }; } { - name = "hosted_git_info___hosted_git_info_2.8.5.tgz"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.8.5.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz"; - sha1 = "759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; + sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488"; }; } { @@ -5138,11 +5394,11 @@ }; } { - name = "html_minifier_terser___html_minifier_terser_5.0.3.tgz"; + name = "html_minifier_terser___html_minifier_terser_5.1.1.tgz"; path = fetchurl { - name = "html_minifier_terser___html_minifier_terser_5.0.3.tgz"; - url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.3.tgz"; - sha1 = "b33549b57be7f0357be0d0b892995aaed1ed90f8"; + name = "html_minifier_terser___html_minifier_terser_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; + sha1 = "922e96f1f3bb60832c2634b79884096389b1f054"; }; } { @@ -5154,11 +5410,11 @@ }; } { - name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.11.tgz"; + name = "html_webpack_plugin___html_webpack_plugin_4.5.0.tgz"; path = fetchurl { - name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.11.tgz"; - url = "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.11.tgz"; - sha1 = "3059a69144b5aecef97708196ca32f9e68677715"; + name = "html_webpack_plugin___html_webpack_plugin_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.0.tgz"; + sha1 = "625097650886b97ea5dae331c320e3238f6c121c"; }; } { @@ -5202,11 +5458,11 @@ }; } { - name = "i18n___i18n_0.8.5.tgz"; + name = "i18n___i18n_0.13.2.tgz"; path = fetchurl { - name = "i18n___i18n_0.8.5.tgz"; - url = "https://registry.yarnpkg.com/i18n/-/i18n-0.8.5.tgz"; - sha1 = "3ae2db28fa1670e3f5ba30d3e505958b0b62e7ec"; + name = "i18n___i18n_0.13.2.tgz"; + url = "https://registry.yarnpkg.com/i18n/-/i18n-0.13.2.tgz"; + sha1 = "3886678fe7cbbed45bac2ce53b8144c788a1c1b5"; }; } { @@ -5218,11 +5474,19 @@ }; } { - name = "iconv_lite___iconv_lite_0.5.1.tgz"; + name = "iconv_lite___iconv_lite_0.5.2.tgz"; path = fetchurl { - name = "iconv_lite___iconv_lite_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.1.tgz"; - sha1 = "b2425d3c7b18f7219f2ca663d103bddb91718d64"; + name = "iconv_lite___iconv_lite_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.2.tgz"; + sha1 = "af6d628dccfb463b7364d97f715e4b74b8c8c2b8"; + }; + } + { + name = "iconv_lite___iconv_lite_0.6.2.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz"; + sha1 = "ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"; }; } { @@ -5242,11 +5506,11 @@ }; } { - name = "ienoopen___ienoopen_1.1.0.tgz"; + name = "ieee754___ieee754_1.2.1.tgz"; path = fetchurl { - name = "ienoopen___ienoopen_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/ienoopen/-/ienoopen-1.1.0.tgz"; - sha1 = "411e5d530c982287dbdc3bb31e7a9c9e32630974"; + name = "ieee754___ieee754_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; + sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; }; } { @@ -5266,14 +5530,6 @@ }; } { - name = "ignore___ignore_3.3.10.tgz"; - path = fetchurl { - name = "ignore___ignore_3.3.10.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz"; - sha1 = "0a97fb876986e8081c631160f8f9f389157f0043"; - }; - } - { name = "ignore___ignore_4.0.6.tgz"; path = fetchurl { name = "ignore___ignore_4.0.6.tgz"; @@ -5282,11 +5538,11 @@ }; } { - name = "ignore___ignore_5.1.4.tgz"; + name = "ignore___ignore_5.1.8.tgz"; path = fetchurl { - name = "ignore___ignore_5.1.4.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz"; - sha1 = "84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"; + name = "ignore___ignore_5.1.8.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz"; + sha1 = "f150a8b50a34289b33e22f5889abd4d8016f0e57"; }; } { @@ -5303,8 +5559,8 @@ let repo = fetchgit { url = "https://github.com/hackmdio/node-imgur.git"; - rev = "4fe9cfa3893505c34c49067483d85d3ad4376cd6"; - sha256 = "1bixzclrs7lzpfkcxwmzl9kz6l2bjz0jz40bikdl1zhgc2zjiiv0"; + rev = "de0a7a1f1eb2cb6628385fedb990ad396a190573"; + sha256 = "11m1wyh6l3ngfgc3qdxa5drlagvniz82fi7c191nb27d3s0lcfmd"; }; in runCommandNoCC "node-imgur.git" { buildInputs = [gnutar]; } '' @@ -5322,11 +5578,11 @@ }; } { - name = "import_fresh___import_fresh_3.2.1.tgz"; + name = "import_fresh___import_fresh_3.2.2.tgz"; path = fetchurl { - name = "import_fresh___import_fresh_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; - sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; + name = "import_fresh___import_fresh_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz"; + sha1 = "fc129c160c5d68235507f4331a6baad186bdbc3e"; }; } { @@ -5354,6 +5610,14 @@ }; } { + name = "indent_string___indent_string_4.0.0.tgz"; + path = fetchurl { + name = "indent_string___indent_string_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; + sha1 = "624f8f4497d619b2d9768531d58f4122854d7251"; + }; + } + { name = "indexes_of___indexes_of_1.0.1.tgz"; path = fetchurl { name = "indexes_of___indexes_of_1.0.1.tgz"; @@ -5434,11 +5698,11 @@ }; } { - name = "interpret___interpret_1.2.0.tgz"; + name = "interpret___interpret_1.4.0.tgz"; path = fetchurl { - name = "interpret___interpret_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz"; - sha1 = "d5061a6224be58e8083985f5014d844359576296"; + name = "interpret___interpret_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz"; + sha1 = "665ab8bc4da27a774a40584e812e3e0fa45b1a1e"; }; } { @@ -5450,14 +5714,6 @@ }; } { - name = "invert_kv___invert_kv_2.0.0.tgz"; - path = fetchurl { - name = "invert_kv___invert_kv_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz"; - sha1 = "7393f5afa59ec9ff5f67a27620d11c226e3eec02"; - }; - } - { name = "ionicons___ionicons_2.0.1.tgz"; path = fetchurl { name = "ionicons___ionicons_2.0.1.tgz"; @@ -5466,11 +5722,11 @@ }; } { - name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; path = fetchurl { - name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; - sha1 = "37df74e430a0e47550fe54a2defe30d8acd95f65"; + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3"; }; } { @@ -5498,6 +5754,30 @@ }; } { + name = "is_alphabetical___is_alphabetical_1.0.4.tgz"; + path = fetchurl { + name = "is_alphabetical___is_alphabetical_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz"; + sha1 = "9e7d6b94916be22153745d184c298cbf986a686d"; + }; + } + { + name = "is_alphanumeric___is_alphanumeric_1.0.0.tgz"; + path = fetchurl { + name = "is_alphanumeric___is_alphanumeric_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz"; + sha1 = "4a9cef71daf4c001c1d81d63d140cf53fd6889f4"; + }; + } + { + name = "is_alphanumerical___is_alphanumerical_1.0.4.tgz"; + path = fetchurl { + name = "is_alphanumerical___is_alphanumerical_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz"; + sha1 = "7eb9a2431f855f6b1ef1a78e326df515696c4dbf"; + }; + } + { name = "is_arguments___is_arguments_1.0.4.tgz"; path = fetchurl { name = "is_arguments___is_arguments_1.0.4.tgz"; @@ -5530,6 +5810,14 @@ }; } { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; + }; + } + { name = "is_bluebird___is_bluebird_1.0.2.tgz"; path = fetchurl { name = "is_bluebird___is_bluebird_1.0.2.tgz"; @@ -5546,11 +5834,19 @@ }; } { - name = "is_callable___is_callable_1.1.5.tgz"; + name = "is_buffer___is_buffer_2.0.5.tgz"; path = fetchurl { - name = "is_callable___is_callable_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz"; - sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab"; + name = "is_buffer___is_buffer_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz"; + sha1 = "ebc252e400d22ff8d77fa09888821a24a658c191"; + }; + } + { + name = "is_callable___is_callable_1.2.2.tgz"; + path = fetchurl { + name = "is_callable___is_callable_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz"; + sha1 = "c7c6715cd22d4ddb48d3e19970223aceabb080d9"; }; } { @@ -5562,6 +5858,14 @@ }; } { + name = "is_core_module___is_core_module_2.2.0.tgz"; + path = fetchurl { + name = "is_core_module___is_core_module_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz"; + sha1 = "97037ef3d52224d85163f5597b2b63d9afed981a"; + }; + } + { name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; path = fetchurl { name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; @@ -5586,6 +5890,14 @@ }; } { + name = "is_decimal___is_decimal_1.0.4.tgz"; + path = fetchurl { + name = "is_decimal___is_decimal_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz"; + sha1 = "65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"; + }; + } + { name = "is_descriptor___is_descriptor_0.1.6.tgz"; path = fetchurl { name = "is_descriptor___is_descriptor_0.1.6.tgz"; @@ -5618,6 +5930,14 @@ }; } { + name = "is_empty___is_empty_1.2.0.tgz"; + path = fetchurl { + name = "is_empty___is_empty_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-empty/-/is-empty-1.2.0.tgz"; + sha1 = "de9bb5b278738a05a0b09a57e1fb4d4a341a9f6b"; + }; + } + { name = "is_equal_shallow___is_equal_shallow_0.1.3.tgz"; path = fetchurl { name = "is_equal_shallow___is_equal_shallow_0.1.3.tgz"; @@ -5682,6 +6002,14 @@ }; } { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + }; + } + { name = "is_glob___is_glob_2.0.1.tgz"; path = fetchurl { name = "is_glob___is_glob_2.0.1.tgz"; @@ -5706,6 +6034,22 @@ }; } { + name = "is_hexadecimal___is_hexadecimal_1.0.4.tgz"; + path = fetchurl { + name = "is_hexadecimal___is_hexadecimal_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz"; + sha1 = "cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"; + }; + } + { + name = "is_negative_zero___is_negative_zero_2.0.0.tgz"; + path = fetchurl { + name = "is_negative_zero___is_negative_zero_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz"; + sha1 = "9553b121b0fac28869da9ed459e20c7543788461"; + }; + } + { name = "is_number___is_number_2.1.0.tgz"; path = fetchurl { name = "is_number___is_number_2.1.0.tgz"; @@ -5730,6 +6074,14 @@ }; } { + name = "is_number___is_number_7.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; + sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + }; + } + { name = "is_obj___is_obj_2.0.0.tgz"; path = fetchurl { name = "is_obj___is_obj_2.0.0.tgz"; @@ -5746,6 +6098,14 @@ }; } { + name = "is_plain_obj___is_plain_obj_2.1.0.tgz"; + path = fetchurl { + name = "is_plain_obj___is_plain_obj_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz"; + sha1 = "45e42e37fccf1f40da8e5f76ee21515840c09287"; + }; + } + { name = "is_plain_object___is_plain_object_2.0.4.tgz"; path = fetchurl { name = "is_plain_object___is_plain_object_2.0.4.tgz"; @@ -5770,11 +6130,11 @@ }; } { - name = "is_promise___is_promise_2.1.0.tgz"; + name = "is_promise___is_promise_2.2.2.tgz"; path = fetchurl { - name = "is_promise___is_promise_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + name = "is_promise___is_promise_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz"; + sha1 = "39ab959ccbf9a774cf079f7b40c7a26f763135f1"; }; } { @@ -5786,19 +6146,11 @@ }; } { - name = "is_regex___is_regex_1.0.5.tgz"; - path = fetchurl { - name = "is_regex___is_regex_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz"; - sha1 = "39d589a358bf18967f726967120b8fc1aed74eae"; - }; - } - { - name = "is_regexp___is_regexp_1.0.0.tgz"; + name = "is_regex___is_regex_1.1.1.tgz"; path = fetchurl { - name = "is_regexp___is_regexp_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz"; - sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069"; + name = "is_regex___is_regex_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz"; + sha1 = "c6f98aacc546f6cec5468a07b7b153ab564a57b9"; }; } { @@ -5810,11 +6162,11 @@ }; } { - name = "is_stream___is_stream_1.1.0.tgz"; + name = "is_stream___is_stream_2.0.0.tgz"; path = fetchurl { - name = "is_stream___is_stream_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + name = "is_stream___is_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz"; + sha1 = "bde9c32680d6fae04129d6ac9d921ce7815f78e3"; }; } { @@ -5850,6 +6202,22 @@ }; } { + name = "is_what___is_what_3.12.0.tgz"; + path = fetchurl { + name = "is_what___is_what_3.12.0.tgz"; + url = "https://registry.yarnpkg.com/is-what/-/is-what-3.12.0.tgz"; + sha1 = "f4405ce4bd6dd420d3ced51a026fb90e03705e55"; + }; + } + { + name = "is_whitespace_character___is_whitespace_character_1.0.4.tgz"; + path = fetchurl { + name = "is_whitespace_character___is_whitespace_character_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz"; + sha1 = "0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"; + }; + } + { name = "is_windows___is_windows_1.0.2.tgz"; path = fetchurl { name = "is_windows___is_windows_1.0.2.tgz"; @@ -5858,6 +6226,14 @@ }; } { + name = "is_word_character___is_word_character_1.0.4.tgz"; + path = fetchurl { + name = "is_word_character___is_word_character_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.4.tgz"; + sha1 = "ce0e73216f98599060592f62ff31354ddbeb0230"; + }; + } + { name = "is_wsl___is_wsl_1.1.0.tgz"; path = fetchurl { name = "is_wsl___is_wsl_1.1.0.tgz"; @@ -5946,19 +6322,19 @@ }; } { - name = "jquery___jquery_3.4.1.tgz"; + name = "jquery___jquery_3.5.1.tgz"; path = fetchurl { - name = "jquery___jquery_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz"; - sha1 = "714f1f8d9dde4bdfa55764ba37ef214630d80ef2"; + name = "jquery___jquery_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz"; + sha1 = "d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"; }; } { - name = "js_beautify___js_beautify_1.10.3.tgz"; + name = "js_beautify___js_beautify_1.13.0.tgz"; path = fetchurl { - name = "js_beautify___js_beautify_1.10.3.tgz"; - url = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.3.tgz"; - sha1 = "c73fa10cf69d3dfa52d8ed624f23c64c0a6a94c1"; + name = "js_beautify___js_beautify_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.13.0.tgz"; + sha1 = "a056d5d3acfd4918549aae3ab039f9f3c51eebb2"; }; } { @@ -5974,9 +6350,9 @@ path = let repo = fetchgit { - url = "https://github.com/codimd/js-sequence-diagrams.git"; - rev = "b9afa038521e5dadf9b97624a3c7db21890be669"; - sha256 = "12v57bdld5a2550xvqh1rcinpld48awgd1s0gbny7z0b0z827ggw"; + url = "https://github.com/hedgedoc/js-sequence-diagrams.git"; + rev = "bda0e49b6c2754f3c7158b1dfb9ccf26efc24b39"; + sha256 = "0d2zf62fmad760rg9hrkyhp03k5apms3fm0mf64yy8q6p3iw7jvw"; }; in runCommandNoCC "js-sequence-diagrams.git" { buildInputs = [gnutar]; } '' @@ -6002,19 +6378,27 @@ }; } { - name = "js_yaml___js_yaml_3.13.1.tgz"; + name = "js_yaml___js_yaml_3.14.0.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.14.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz"; + sha1 = "a7a34170f26a21bb162424d8adacb4113a69e482"; + }; + } + { + name = "js_yaml___js_yaml_3.14.1.tgz"; path = fetchurl { - name = "js_yaml___js_yaml_3.13.1.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz"; - sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847"; + name = "js_yaml___js_yaml_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; + sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; }; } { - name = "jsbi___jsbi_3.1.1.tgz"; + name = "jsbi___jsbi_3.1.4.tgz"; path = fetchurl { - name = "jsbi___jsbi_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/jsbi/-/jsbi-3.1.1.tgz"; - sha1 = "8ea18b3e08d102c6cc09acaa9a099921d775f4fa"; + name = "jsbi___jsbi_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/jsbi/-/jsbi-3.1.4.tgz"; + sha1 = "9654dd02207a66a4911b4e4bb74265bc2cbc9dd0"; }; } { @@ -6074,6 +6458,14 @@ }; } { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + path = fetchurl { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha1 = "7c47805a94319928e05777405dc12e1f7a4ee02d"; + }; + } + { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; path = fetchurl { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; @@ -6130,11 +6522,11 @@ }; } { - name = "jsonfile___jsonfile_2.4.0.tgz"; + name = "json5___json5_2.1.3.tgz"; path = fetchurl { - name = "jsonfile___jsonfile_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz"; - sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; + name = "json5___json5_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz"; + sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; }; } { @@ -6186,14 +6578,6 @@ }; } { - name = "kew___kew_0.7.0.tgz"; - path = fetchurl { - name = "kew___kew_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz"; - sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; - }; - } - { name = "keymaster___keymaster_1.6.2.tgz"; path = fetchurl { name = "keymaster___keymaster_1.6.2.tgz"; @@ -6202,6 +6586,14 @@ }; } { + name = "khroma___khroma_1.1.0.tgz"; + path = fetchurl { + name = "khroma___khroma_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/khroma/-/khroma-1.1.0.tgz"; + sha1 = "cc17723eb719c5245ea66d23dd577d5695452db5"; + }; + } + { name = "kind_of___kind_of_3.2.2.tgz"; path = fetchurl { name = "kind_of___kind_of_3.2.2.tgz"; @@ -6234,19 +6626,11 @@ }; } { - name = "klaw___klaw_1.3.1.tgz"; - path = fetchurl { - name = "klaw___klaw_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz"; - sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; - }; - } - { - name = "kuler___kuler_1.0.1.tgz"; + name = "kuler___kuler_2.0.0.tgz"; path = fetchurl { - name = "kuler___kuler_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/kuler/-/kuler-1.0.1.tgz"; - sha1 = "ef7c784f36c9fb6e16dd3150d152677b2b0228a6"; + name = "kuler___kuler_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz"; + sha1 = "e2c570a3800388fb44407e851531c1d670b061b3"; }; } { @@ -6258,14 +6642,6 @@ }; } { - name = "lazy_cache___lazy_cache_1.0.4.tgz"; - path = fetchurl { - name = "lazy_cache___lazy_cache_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz"; - sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; - }; - } - { name = "lazystream___lazystream_1.0.0.tgz"; path = fetchurl { name = "lazystream___lazystream_1.0.0.tgz"; @@ -6274,14 +6650,6 @@ }; } { - name = "lcid___lcid_2.0.0.tgz"; - path = fetchurl { - name = "lcid___lcid_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz"; - sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf"; - }; - } - { name = "ldap_filter___ldap_filter_0.2.2.tgz"; path = fetchurl { name = "ldap_filter___ldap_filter_0.2.2.tgz"; @@ -6290,11 +6658,11 @@ }; } { - name = "ldapauth_fork___ldapauth_fork_4.3.1.tgz"; + name = "ldapauth_fork___ldapauth_fork_4.3.3.tgz"; path = fetchurl { - name = "ldapauth_fork___ldapauth_fork_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-4.3.1.tgz"; - sha1 = "500c04f339257ac0e189af8752ec5df43982ceac"; + name = "ldapauth_fork___ldapauth_fork_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-4.3.3.tgz"; + sha1 = "d62c8f18a5035fd47a572f2ac7aa8c8227b3f4c2"; }; } { @@ -6322,11 +6690,11 @@ }; } { - name = "less___less_3.11.1.tgz"; + name = "less___less_3.13.1.tgz"; path = fetchurl { - name = "less___less_3.11.1.tgz"; - url = "https://registry.yarnpkg.com/less/-/less-3.11.1.tgz"; - sha1 = "c6bf08e39e02404fe6b307a3dfffafdc55bd36e2"; + name = "less___less_3.13.1.tgz"; + url = "https://registry.yarnpkg.com/less/-/less-3.13.1.tgz"; + sha1 = "0ebc91d2a0e9c0c6735b83d496b0ab0583077909"; }; } { @@ -6338,6 +6706,22 @@ }; } { + name = "libnpmconfig___libnpmconfig_1.2.1.tgz"; + path = fetchurl { + name = "libnpmconfig___libnpmconfig_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/libnpmconfig/-/libnpmconfig-1.2.1.tgz"; + sha1 = "c0c2f793a74e67d4825e5039e7a02a0044dfcbc0"; + }; + } + { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + path = fetchurl { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; + sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + }; + } + { name = "linkify_it___linkify_it_2.2.0.tgz"; path = fetchurl { name = "linkify_it___linkify_it_2.2.0.tgz"; @@ -6362,6 +6746,14 @@ }; } { + name = "load_plugin___load_plugin_3.0.0.tgz"; + path = fetchurl { + name = "load_plugin___load_plugin_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/load-plugin/-/load-plugin-3.0.0.tgz"; + sha1 = "8f3ce57cf4e5111639911012487bc1c2ba3d0e6c"; + }; + } + { name = "loader_runner___loader_runner_2.4.0.tgz"; path = fetchurl { name = "loader_runner___loader_runner_2.4.0.tgz"; @@ -6370,11 +6762,19 @@ }; } { - name = "loader_utils___loader_utils_1.2.3.tgz"; + name = "loader_utils___loader_utils_1.4.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz"; + sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"; + }; + } + { + name = "loader_utils___loader_utils_2.0.0.tgz"; path = fetchurl { - name = "loader_utils___loader_utils_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz"; - sha1 = "1ff5dc6911c9f0a062531a4c04b609406108c2c7"; + name = "loader_utils___loader_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz"; + sha1 = "e4cace5b816d425a166b5f097e10cd12b36064b0"; }; } { @@ -6394,6 +6794,14 @@ }; } { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + }; + } + { name = "lodash.assignin___lodash.assignin_4.2.0.tgz"; path = fetchurl { name = "lodash.assignin___lodash.assignin_4.2.0.tgz"; @@ -6418,6 +6826,14 @@ }; } { + name = "lodash.difference___lodash.difference_4.5.0.tgz"; + path = fetchurl { + name = "lodash.difference___lodash.difference_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz"; + sha1 = "9ccb4e505d486b91651345772885a2df27fd017c"; + }; + } + { name = "lodash.filter___lodash.filter_4.6.0.tgz"; path = fetchurl { name = "lodash.filter___lodash.filter_4.6.0.tgz"; @@ -6442,6 +6858,14 @@ }; } { + name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; + path = fetchurl { + name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; + sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; + }; + } + { name = "lodash.map___lodash.map_4.6.0.tgz"; path = fetchurl { name = "lodash.map___lodash.map_4.6.0.tgz"; @@ -6506,6 +6930,14 @@ }; } { + name = "lodash.union___lodash.union_4.6.0.tgz"; + path = fetchurl { + name = "lodash.union___lodash.union_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz"; + sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; + }; + } + { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; path = fetchurl { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; @@ -6514,19 +6946,19 @@ }; } { - name = "lodash___lodash_4.17.15.tgz"; + name = "lodash___lodash_4.17.20.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.15.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; - sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; + name = "lodash___lodash_4.17.20.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz"; + sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52"; }; } { - name = "logform___logform_2.1.2.tgz"; + name = "logform___logform_2.2.0.tgz"; path = fetchurl { - name = "logform___logform_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/logform/-/logform-2.1.2.tgz"; - sha1 = "957155ebeb67a13164069825ce67ddb5bb2dd360"; + name = "logform___logform_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz"; + sha1 = "40f036d19161fc76b68ab50fdc7fe495544492f2"; }; } { @@ -6538,11 +6970,11 @@ }; } { - name = "longest___longest_1.0.1.tgz"; + name = "longest_streak___longest_streak_2.0.4.tgz"; path = fetchurl { - name = "longest___longest_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz"; - sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + name = "longest_streak___longest_streak_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz"; + sha1 = "b8599957da5b5dab64dee3fe316fa774597d90e4"; }; } { @@ -6562,6 +6994,14 @@ }; } { + name = "lower_case___lower_case_2.0.1.tgz"; + path = fetchurl { + name = "lower_case___lower_case_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz"; + sha1 = "39eeb36e396115cc05e29422eaea9e692c9408c7"; + }; + } + { name = "lru_cache___lru_cache_4.1.5.tgz"; path = fetchurl { name = "lru_cache___lru_cache_4.1.5.tgz"; @@ -6578,6 +7018,14 @@ }; } { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + }; + } + { name = "lru_queue___lru_queue_0.1.0.tgz"; path = fetchurl { name = "lru_queue___lru_queue_0.1.0.tgz"; @@ -6586,11 +7034,11 @@ }; } { - name = "lutim___lutim_1.0.2.tgz"; + name = "lutim___lutim_1.0.3.tgz"; path = fetchurl { - name = "lutim___lutim_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/lutim/-/lutim-1.0.2.tgz"; - sha1 = "0b1e5a83c0c8d45900beb4eaf551e34f34f8a3e8"; + name = "lutim___lutim_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/lutim/-/lutim-1.0.3.tgz"; + sha1 = "3a29d0f2731eed7097f2d7367defeaa2ae45d820"; }; } { @@ -6610,14 +7058,6 @@ ''; } { - name = "magic_string___magic_string_0.25.6.tgz"; - path = fetchurl { - name = "magic_string___magic_string_0.25.6.tgz"; - url = "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.6.tgz"; - sha1 = "5586387d1242f919c6d223579cc938bf1420795e"; - }; - } - { name = "make_dir___make_dir_1.3.0.tgz"; path = fetchurl { name = "make_dir___make_dir_1.3.0.tgz"; @@ -6634,35 +7074,27 @@ }; } { - name = "make_plural___make_plural_4.3.0.tgz"; + name = "make_dir___make_dir_3.1.0.tgz"; path = fetchurl { - name = "make_plural___make_plural_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/make-plural/-/make-plural-4.3.0.tgz"; - sha1 = "f23de08efdb0cac2e0c9ba9f315b0dff6b4c2735"; - }; - } - { - name = "make_plural___make_plural_6.0.1.tgz"; - path = fetchurl { - name = "make_plural___make_plural_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/make-plural/-/make-plural-6.0.1.tgz"; - sha1 = "ed3839fac3f469ebbe505751d48fe3319769edfc"; + name = "make_dir___make_dir_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; + sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; }; } { - name = "mamacro___mamacro_0.0.3.tgz"; + name = "make_plural___make_plural_4.3.0.tgz"; path = fetchurl { - name = "mamacro___mamacro_0.0.3.tgz"; - url = "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz"; - sha1 = "ad2c9576197c9f1abf308d0787865bd975a3f3e4"; + name = "make_plural___make_plural_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/make-plural/-/make-plural-4.3.0.tgz"; + sha1 = "f23de08efdb0cac2e0c9ba9f315b0dff6b4c2735"; }; } { - name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; + name = "make_plural___make_plural_6.2.2.tgz"; path = fetchurl { - name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; - sha1 = "7d583a7306434c055fe474b0f45078e6e1b4b92a"; + name = "make_plural___make_plural_6.2.2.tgz"; + url = "https://registry.yarnpkg.com/make-plural/-/make-plural-6.2.2.tgz"; + sha1 = "beb5fd751355e72660eeb2218bb98eec92853c6c"; }; } { @@ -6682,11 +7114,27 @@ }; } { - name = "mariadb___mariadb_2.2.0.tgz"; + name = "mariadb___mariadb_2.5.2.tgz"; path = fetchurl { - name = "mariadb___mariadb_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/mariadb/-/mariadb-2.2.0.tgz"; - sha1 = "077e8c44ded718f2ecebef321c3703fe8d524504"; + name = "mariadb___mariadb_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.2.tgz"; + sha1 = "0046331541589a9c0405507d91d79bcc972b3f5e"; + }; + } + { + name = "markdown_escapes___markdown_escapes_1.0.4.tgz"; + path = fetchurl { + name = "markdown_escapes___markdown_escapes_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz"; + sha1 = "c95415ef451499d7602b91095f3c8e8975f78535"; + }; + } + { + name = "markdown_extensions___markdown_extensions_1.1.1.tgz"; + path = fetchurl { + name = "markdown_extensions___markdown_extensions_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/markdown-extensions/-/markdown-extensions-1.1.1.tgz"; + sha1 = "fea03b539faeaee9b4ef02a3769b455b189f7fc3"; }; } { @@ -6706,11 +7154,11 @@ }; } { - name = "markdown_it_deflist___markdown_it_deflist_2.0.3.tgz"; + name = "markdown_it_deflist___markdown_it_deflist_2.1.0.tgz"; path = fetchurl { - name = "markdown_it_deflist___markdown_it_deflist_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/markdown-it-deflist/-/markdown-it-deflist-2.0.3.tgz"; - sha1 = "5727db04184d3cb2bc6ee4a9641e3a1091d5fd6f"; + name = "markdown_it_deflist___markdown_it_deflist_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/markdown-it-deflist/-/markdown-it-deflist-2.1.0.tgz"; + sha1 = "50d7a56b9544cd81252f7623bd785e28a8dcef5c"; }; } { @@ -6794,19 +7242,19 @@ }; } { - name = "markdown_pdf___markdown_pdf_10.0.0.tgz"; + name = "markdown_table___markdown_table_2.0.0.tgz"; path = fetchurl { - name = "markdown_pdf___markdown_pdf_10.0.0.tgz"; - url = "https://registry.yarnpkg.com/markdown-pdf/-/markdown-pdf-10.0.0.tgz"; - sha1 = "0cf7a32740c2966aa79392a35742749d6ed2a491"; + name = "markdown_table___markdown_table_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/markdown-table/-/markdown-table-2.0.0.tgz"; + sha1 = "194a90ced26d31fe753d8b9434430214c011865b"; }; } { - name = "marked___marked_0.8.0.tgz"; + name = "marked___marked_1.2.7.tgz"; path = fetchurl { - name = "marked___marked_0.8.0.tgz"; - url = "https://registry.yarnpkg.com/marked/-/marked-0.8.0.tgz"; - sha1 = "ec5c0c9b93878dc52dd54be8d0e524097bd81a99"; + name = "marked___marked_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/marked/-/marked-1.2.7.tgz"; + sha1 = "6e14b595581d2319cdcf033a24caaf41455a01fb"; }; } { @@ -6826,11 +7274,11 @@ }; } { - name = "mathjax___mathjax_2.7.7.tgz"; + name = "mathjax___mathjax_2.7.9.tgz"; path = fetchurl { - name = "mathjax___mathjax_2.7.7.tgz"; - url = "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.7.tgz"; - sha1 = "22ff89550a7b1f5f06a037d13da5ff3c33e11ec4"; + name = "mathjax___mathjax_2.7.9.tgz"; + url = "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.9.tgz"; + sha1 = "d6b67955c173e7d719fcb2fc0288662884eb7d3d"; }; } { @@ -6858,6 +7306,46 @@ }; } { + name = "mdast_comment_marker___mdast_comment_marker_1.1.2.tgz"; + path = fetchurl { + name = "mdast_comment_marker___mdast_comment_marker_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/mdast-comment-marker/-/mdast-comment-marker-1.1.2.tgz"; + sha1 = "5ad2e42cfcc41b92a10c1421a98c288d7b447a6d"; + }; + } + { + name = "mdast_util_compact___mdast_util_compact_2.0.1.tgz"; + path = fetchurl { + name = "mdast_util_compact___mdast_util_compact_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz"; + sha1 = "cabc69a2f43103628326f35b1acf735d55c99490"; + }; + } + { + name = "mdast_util_heading_style___mdast_util_heading_style_1.0.6.tgz"; + path = fetchurl { + name = "mdast_util_heading_style___mdast_util_heading_style_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-heading-style/-/mdast-util-heading-style-1.0.6.tgz"; + sha1 = "6410418926fd5673d40f519406b35d17da10e3c5"; + }; + } + { + name = "mdast_util_to_string___mdast_util_to_string_1.1.0.tgz"; + path = fetchurl { + name = "mdast_util_to_string___mdast_util_to_string_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz"; + sha1 = "27055500103f51637bd07d01da01eb1967a43527"; + }; + } + { + name = "mdn_data___mdn_data_2.0.12.tgz"; + path = fetchurl { + name = "mdn_data___mdn_data_2.0.12.tgz"; + url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.12.tgz"; + sha1 = "bbb658d08b38f574bbb88f7b83703defdcc46844"; + }; + } + { name = "mdn_data___mdn_data_2.0.4.tgz"; path = fetchurl { name = "mdn_data___mdn_data_2.0.4.tgz"; @@ -6882,14 +7370,6 @@ }; } { - name = "mem___mem_4.3.0.tgz"; - path = fetchurl { - name = "mem___mem_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz"; - sha1 = "461af497bc4ae09608cdb2e60eefb69bff744178"; - }; - } - { name = "memoizee___memoizee_0.4.14.tgz"; path = fetchurl { name = "memoizee___memoizee_0.4.14.tgz"; @@ -6922,11 +7402,19 @@ }; } { - name = "mermaid___mermaid_8.4.7.tgz"; + name = "merge2___merge2_1.4.1.tgz"; path = fetchurl { - name = "mermaid___mermaid_8.4.7.tgz"; - url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.4.7.tgz"; - sha1 = "1af8f6bece99f022a514471c42b80cabf7706501"; + name = "merge2___merge2_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz"; + sha1 = "4368892f885e907455a6fd7dc55c0c9d404990ae"; + }; + } + { + name = "mermaid___mermaid_8.8.4.tgz"; + path = fetchurl { + name = "mermaid___mermaid_8.8.4.tgz"; + url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.8.4.tgz"; + sha1 = "5ea699bcfa1ef848d78b2ce8efb1e0118f30d9f7"; }; } { @@ -6938,11 +7426,11 @@ }; } { - name = "messageformat_parser___messageformat_parser_4.1.2.tgz"; + name = "messageformat_parser___messageformat_parser_4.1.3.tgz"; path = fetchurl { - name = "messageformat_parser___messageformat_parser_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/messageformat-parser/-/messageformat-parser-4.1.2.tgz"; - sha1 = "fd34ec39912a14868a1595eaeb742485ab8ab372"; + name = "messageformat_parser___messageformat_parser_4.1.3.tgz"; + url = "https://registry.yarnpkg.com/messageformat-parser/-/messageformat-parser-4.1.3.tgz"; + sha1 = "b824787f57fcda7d50769f5b63e8d4fda68f5b9e"; }; } { @@ -6958,9 +7446,9 @@ path = let repo = fetchgit { - url = "https://github.com/codimd/meta-marked"; - rev = "a7b45a287465f79656134ff7142d1d74c8fcacfd"; - sha256 = "0cd3mxxgr3h49y6df5py8d36pyxv2j8kafxfw0npqhss9233f491"; + url = "https://github.com/hedgedoc/meta-marked"; + rev = "4fb5cb5a204969cc91e66eee92c0211188e69a2b"; + sha256 = "05fi7p37zqqbrrk929pp6945prg4qb27q0rm81ginw3aqawps33c"; }; in runCommandNoCC "meta-marked" { buildInputs = [gnutar]; } '' @@ -7002,6 +7490,14 @@ }; } { + name = "micromatch___micromatch_4.0.2.tgz"; + path = fetchurl { + name = "micromatch___micromatch_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz"; + sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"; + }; + } + { name = "miller_rabin___miller_rabin_4.0.1.tgz"; path = fetchurl { name = "miller_rabin___miller_rabin_4.0.1.tgz"; @@ -7010,19 +7506,27 @@ }; } { - name = "mime_db___mime_db_1.43.0.tgz"; + name = "mime_db___mime_db_1.44.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.43.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz"; - sha1 = "0a12e0502650e473d735535050e7c8f4eb4fae58"; + name = "mime_db___mime_db_1.44.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz"; + sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"; }; } { - name = "mime_types___mime_types_2.1.26.tgz"; + name = "mime_db___mime_db_1.45.0.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.26.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz"; - sha1 = "9c921fc09b7e149a65dfdc0da4d20997200b0a06"; + name = "mime_db___mime_db_1.45.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz"; + sha1 = "cceeda21ccd7c3a745eba2decd55d4b73e7879ea"; + }; + } + { + name = "mime_types___mime_types_2.1.27.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.27.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; + sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; }; } { @@ -7042,11 +7546,11 @@ }; } { - name = "mime___mime_2.4.4.tgz"; + name = "mime___mime_2.4.6.tgz"; path = fetchurl { - name = "mime___mime_2.4.4.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz"; - sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5"; + name = "mime___mime_2.4.6.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz"; + sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1"; }; } { @@ -7058,19 +7562,11 @@ }; } { - name = "mimic_fn___mimic_fn_2.1.0.tgz"; - path = fetchurl { - name = "mimic_fn___mimic_fn_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; - sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; - }; - } - { - name = "mini_css_extract_plugin___mini_css_extract_plugin_0.8.2.tgz"; + name = "mini_css_extract_plugin___mini_css_extract_plugin_0.12.0.tgz"; path = fetchurl { - name = "mini_css_extract_plugin___mini_css_extract_plugin_0.8.2.tgz"; - url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.2.tgz"; - sha1 = "a875e169beb27c88af77dd962771c9eedc3da161"; + name = "mini_css_extract_plugin___mini_css_extract_plugin_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.12.0.tgz"; + sha1 = "ddeb74fd6304ca9f99c1db74acc7d5b507705454"; }; } { @@ -7114,19 +7610,11 @@ }; } { - name = "minimist___minimist_1.2.0.tgz"; + name = "minimist___minimist_1.2.5.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - } - { - name = "minimist___minimist_0.0.10.tgz"; - path = fetchurl { - name = "minimist___minimist_0.0.10.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; }; } { @@ -7138,6 +7626,30 @@ }; } { + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + path = fetchurl { + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha1 = "22b813bf745dc6edba2576b940022ad6edc8c617"; + }; + } + { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + path = fetchurl { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha1 = "82e7135d7e89a50ffe64610a787953c4c4cbb373"; + }; + } + { + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + path = fetchurl { + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; + sha1 = "68472f79711c084657c067c5c6ad93cddea8214c"; + }; + } + { name = "minipass___minipass_2.9.0.tgz"; path = fetchurl { name = "minipass___minipass_2.9.0.tgz"; @@ -7146,6 +7658,14 @@ }; } { + name = "minipass___minipass_3.1.3.tgz"; + path = fetchurl { + name = "minipass___minipass_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz"; + sha1 = "7d42ff1f39635482e15f9cdb53184deebd5815fd"; + }; + } + { name = "minizlib___minizlib_1.3.3.tgz"; path = fetchurl { name = "minizlib___minizlib_1.3.3.tgz"; @@ -7154,6 +7674,14 @@ }; } { + name = "minizlib___minizlib_2.1.2.tgz"; + path = fetchurl { + name = "minizlib___minizlib_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz"; + sha1 = "e90d3466ba209b932451508a11ce3d3632145931"; + }; + } + { name = "mississippi___mississippi_3.0.0.tgz"; path = fetchurl { name = "mississippi___mississippi_3.0.0.tgz"; @@ -7178,6 +7706,22 @@ }; } { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "mkdirp___mkdirp_1.0.4.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; + sha1 = "3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"; + }; + } + { name = "mocha___mocha_5.2.0.tgz"; path = fetchurl { name = "mocha___mocha_5.2.0.tgz"; @@ -7202,27 +7746,27 @@ }; } { - name = "moment_timezone___moment_timezone_0.5.27.tgz"; + name = "moment_timezone___moment_timezone_0.5.32.tgz"; path = fetchurl { - name = "moment_timezone___moment_timezone_0.5.27.tgz"; - url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.27.tgz"; - sha1 = "73adec8139b6fe30452e78f210f27b1f346b8877"; + name = "moment_timezone___moment_timezone_0.5.32.tgz"; + url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.32.tgz"; + sha1 = "db7677cc3cc680fd30303ebd90b0da1ca0dfecc2"; }; } { - name = "moment___moment_2.24.0.tgz"; + name = "moment___moment_2.29.1.tgz"; path = fetchurl { - name = "moment___moment_2.24.0.tgz"; - url = "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz"; - sha1 = "0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"; + name = "moment___moment_2.29.1.tgz"; + url = "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz"; + sha1 = "b2be769fa31940be9eeea6469c075e35006fa3d3"; }; } { - name = "morgan___morgan_1.9.1.tgz"; + name = "morgan___morgan_1.10.0.tgz"; path = fetchurl { - name = "morgan___morgan_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz"; - sha1 = "0a8d16734a1d9afbc824b99df87e738e58e2da59"; + name = "morgan___morgan_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz"; + sha1 = "091778abc1fc47cd3509824653dae1faab6b17d7"; }; } { @@ -7258,11 +7802,11 @@ }; } { - name = "mustache___mustache_4.0.0.tgz"; + name = "mustache___mustache_4.0.1.tgz"; path = fetchurl { - name = "mustache___mustache_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/mustache/-/mustache-4.0.0.tgz"; - sha1 = "7f02465dbb5b435859d154831c032acdfbbefb31"; + name = "mustache___mustache_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/mustache/-/mustache-4.0.1.tgz"; + sha1 = "d99beb031701ad433338e7ea65e0489416c854a2"; }; } { @@ -7282,11 +7826,11 @@ }; } { - name = "mysql2___mysql2_2.1.0.tgz"; + name = "mysql2___mysql2_2.2.5.tgz"; path = fetchurl { - name = "mysql2___mysql2_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/mysql2/-/mysql2-2.1.0.tgz"; - sha1 = "55ecfd4353114c148cc4c253192dbbfd000e6642"; + name = "mysql2___mysql2_2.2.5.tgz"; + url = "https://registry.yarnpkg.com/mysql2/-/mysql2-2.2.5.tgz"; + sha1 = "72624ffb4816f80f96b9c97fedd8c00935f9f340"; }; } { @@ -7298,11 +7842,19 @@ }; } { - name = "nan___nan_2.14.0.tgz"; + name = "nan___nan_2.14.2.tgz"; + path = fetchurl { + name = "nan___nan_2.14.2.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz"; + sha1 = "f5376400695168f4cc694ac9393d0c9585eeea19"; + }; + } + { + name = "nanoid___nanoid_2.1.11.tgz"; path = fetchurl { - name = "nan___nan_2.14.0.tgz"; - url = "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz"; - sha1 = "7818f722027b2459a86f0295d434d1fc2336c52c"; + name = "nanoid___nanoid_2.1.11.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz"; + sha1 = "ec24b8a758d591561531b4176a01e3ab4f0f0280"; }; } { @@ -7322,6 +7874,14 @@ }; } { + name = "native_request___native_request_1.0.8.tgz"; + path = fetchurl { + name = "native_request___native_request_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz"; + sha1 = "8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb"; + }; + } + { name = "natural_compare___natural_compare_1.4.0.tgz"; path = fetchurl { name = "natural_compare___natural_compare_1.4.0.tgz"; @@ -7338,11 +7898,11 @@ }; } { - name = "needle___needle_2.3.2.tgz"; + name = "needle___needle_2.5.2.tgz"; path = fetchurl { - name = "needle___needle_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz"; - sha1 = "3342dea100b7160960a450dc8c22160ac712a528"; + name = "needle___needle_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/needle/-/needle-2.5.2.tgz"; + sha1 = "cf1a8fce382b5a280108bba90a14993c00e4010a"; }; } { @@ -7354,11 +7914,11 @@ }; } { - name = "neo_async___neo_async_2.6.1.tgz"; + name = "neo_async___neo_async_2.6.2.tgz"; path = fetchurl { - name = "neo_async___neo_async_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz"; - sha1 = "ac27ada66167fa8849a6addd837f6b189ad2081c"; + name = "neo_async___neo_async_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz"; + sha1 = "b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"; }; } { @@ -7394,6 +7954,14 @@ }; } { + name = "no_case___no_case_3.0.3.tgz"; + path = fetchurl { + name = "no_case___no_case_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz"; + sha1 = "c21b434c1ffe48b39087e86cfb4d2582e9df18f8"; + }; + } + { name = "nocache___nocache_2.1.0.tgz"; path = fetchurl { name = "nocache___nocache_2.1.0.tgz"; @@ -7402,19 +7970,19 @@ }; } { - name = "node_forge___node_forge_0.7.6.tgz"; + name = "node_forge___node_forge_0.10.0.tgz"; path = fetchurl { - name = "node_forge___node_forge_0.7.6.tgz"; - url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz"; - sha1 = "fdf3b418aee1f94f0ef642cd63486c77ca9724ac"; + name = "node_forge___node_forge_0.10.0.tgz"; + url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz"; + sha1 = "32dea2afb3e9926f02ee5ce8794902691a676bf3"; }; } { - name = "node_gyp_build___node_gyp_build_3.7.0.tgz"; + name = "node_gyp_build___node_gyp_build_4.2.3.tgz"; path = fetchurl { - name = "node_gyp_build___node_gyp_build_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-3.7.0.tgz"; - sha1 = "daa77a4f547b9aed3e2aac779eaf151afd60ec8d"; + name = "node_gyp_build___node_gyp_build_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz"; + sha1 = "ce6277f853835f718829efb47db20f3e4d9c4739"; }; } { @@ -7426,14 +7994,6 @@ }; } { - name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz"; - path = fetchurl { - name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz"; - sha1 = "9a0596533b877289bcad4e143982ca3d904ddc83"; - }; - } - { name = "node_pre_gyp___node_pre_gyp_0.11.0.tgz"; path = fetchurl { name = "node_pre_gyp___node_pre_gyp_0.11.0.tgz"; @@ -7442,19 +8002,11 @@ }; } { - name = "node_releases___node_releases_1.1.49.tgz"; - path = fetchurl { - name = "node_releases___node_releases_1.1.49.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.49.tgz"; - sha1 = "67ba5a3fac2319262675ef864ed56798bb33b93e"; - }; - } - { - name = "node_static___node_static_0.7.11.tgz"; + name = "node_releases___node_releases_1.1.66.tgz"; path = fetchurl { - name = "node_static___node_static_0.7.11.tgz"; - url = "https://registry.yarnpkg.com/node-static/-/node-static-0.7.11.tgz"; - sha1 = "60120d349f3cef533e4e820670057eb631882e7f"; + name = "node_releases___node_releases_1.1.66.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.66.tgz"; + sha1 = "609bd0dc069381015cd982300bae51ab4f1b1814"; }; } { @@ -7466,11 +8018,19 @@ }; } { - name = "nopt___nopt_4.0.1.tgz"; + name = "nopt___nopt_4.0.3.tgz"; path = fetchurl { - name = "nopt___nopt_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz"; - sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + name = "nopt___nopt_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz"; + sha1 = "a375cad9d02fd921278d954c2254d5aa57e15e48"; + }; + } + { + name = "nopt___nopt_5.0.0.tgz"; + path = fetchurl { + name = "nopt___nopt_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz"; + sha1 = "530942bb58a512fccafe53fe210f13a25355dc88"; }; } { @@ -7538,14 +8098,6 @@ }; } { - name = "npm_run_path___npm_run_path_2.0.2.tgz"; - path = fetchurl { - name = "npm_run_path___npm_run_path_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; - }; - } - { name = "npmlog___npmlog_4.1.2.tgz"; path = fetchurl { name = "npmlog___npmlog_4.1.2.tgz"; @@ -7626,19 +8178,19 @@ }; } { - name = "object_inspect___object_inspect_1.7.0.tgz"; + name = "object_inspect___object_inspect_1.8.0.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz"; - sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"; + name = "object_inspect___object_inspect_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz"; + sha1 = "df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"; }; } { - name = "object_is___object_is_1.0.2.tgz"; + name = "object_is___object_is_1.1.3.tgz"; path = fetchurl { - name = "object_is___object_is_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz"; - sha1 = "6b80eb84fe451498f65007982f035a5b445edec4"; + name = "object_is___object_is_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz"; + sha1 = "2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"; }; } { @@ -7658,11 +8210,11 @@ }; } { - name = "object.assign___object.assign_4.1.0.tgz"; + name = "object.assign___object.assign_4.1.2.tgz"; path = fetchurl { - name = "object.assign___object.assign_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz"; - sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da"; + name = "object.assign___object.assign_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz"; + sha1 = "0ed54a342eceb37b38ff76eb831a0e788cb63940"; }; } { @@ -7722,11 +8274,11 @@ }; } { - name = "one_time___one_time_0.0.4.tgz"; + name = "one_time___one_time_1.0.0.tgz"; path = fetchurl { - name = "one_time___one_time_0.0.4.tgz"; - url = "https://registry.yarnpkg.com/one-time/-/one-time-0.0.4.tgz"; - sha1 = "f8cdf77884826fe4dff93e3a9cc37b1e4480742e"; + name = "one_time___one_time_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz"; + sha1 = "e06bc174aed214ed58edede573b433bbf827cb45"; }; } { @@ -7738,27 +8290,19 @@ }; } { - name = "openid___openid_2.0.6.tgz"; + name = "openid___openid_2.0.7.tgz"; path = fetchurl { - name = "openid___openid_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/openid/-/openid-2.0.6.tgz"; - sha1 = "707375e59ab9f73025899727679b20328171c9aa"; + name = "openid___openid_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/openid/-/openid-2.0.7.tgz"; + sha1 = "37bf50af2aa692623364c004de35d41fd399c6e4"; }; } { - name = "optimist___optimist_0.6.1.tgz"; + name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.4.tgz"; path = fetchurl { - name = "optimist___optimist_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz"; - sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; - }; - } - { - name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.3.tgz"; - path = fetchurl { - name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.3.tgz"; - url = "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz"; - sha1 = "e2f1d4d94ad8c0af8967ebd7cf138dcb1ef14572"; + name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.4.tgz"; + url = "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz"; + sha1 = "85883c6528aaa02e30bbad9908c92926bb52dc90"; }; } { @@ -7786,22 +8330,6 @@ }; } { - name = "os_homedir___os_homedir_2.0.0.tgz"; - path = fetchurl { - name = "os_homedir___os_homedir_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-2.0.0.tgz"; - sha1 = "a0c76bb001a8392a503cbd46e7e650b3423a923c"; - }; - } - { - name = "os_locale___os_locale_3.1.0.tgz"; - path = fetchurl { - name = "os_locale___os_locale_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz"; - sha1 = "a802a6ee17f24c10483ab9935719cef4ed16bf1a"; - }; - } - { name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; path = fetchurl { name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; @@ -7826,30 +8354,6 @@ }; } { - name = "p_defer___p_defer_1.0.0.tgz"; - path = fetchurl { - name = "p_defer___p_defer_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz"; - sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; - }; - } - { - name = "p_finally___p_finally_1.0.0.tgz"; - path = fetchurl { - name = "p_finally___p_finally_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz"; - sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; - }; - } - { - name = "p_is_promise___p_is_promise_2.1.0.tgz"; - path = fetchurl { - name = "p_is_promise___p_is_promise_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz"; - sha1 = "918cebaea248a62cf7ffab8e3bca8c5f882fc42e"; - }; - } - { name = "p_limit___p_limit_1.3.0.tgz"; path = fetchurl { name = "p_limit___p_limit_1.3.0.tgz"; @@ -7858,11 +8362,19 @@ }; } { - name = "p_limit___p_limit_2.2.2.tgz"; + name = "p_limit___p_limit_2.3.0.tgz"; path = fetchurl { - name = "p_limit___p_limit_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz"; - sha1 = "61279b67721f5287aa1c13a9a7fbbc48c9291b1e"; + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + }; + } + { + name = "p_limit___p_limit_3.0.2.tgz"; + path = fetchurl { + name = "p_limit___p_limit_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz"; + sha1 = "1664e010af3cadc681baafd3e2a437be7b0fb5fe"; }; } { @@ -7882,6 +8394,22 @@ }; } { + name = "p_locate___p_locate_4.1.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + }; + } + { + name = "p_map___p_map_4.0.0.tgz"; + path = fetchurl { + name = "p_map___p_map_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz"; + sha1 = "bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"; + }; + } + { name = "p_try___p_try_1.0.0.tgz"; path = fetchurl { name = "p_try___p_try_1.0.0.tgz"; @@ -7930,6 +8458,14 @@ }; } { + name = "param_case___param_case_3.0.3.tgz"; + path = fetchurl { + name = "param_case___param_case_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz"; + sha1 = "4be41f8399eff621c56eebb829a5e451d9801238"; + }; + } + { name = "parent_module___parent_module_1.0.1.tgz"; path = fetchurl { name = "parent_module___parent_module_1.0.1.tgz"; @@ -7938,11 +8474,19 @@ }; } { - name = "parse_asn1___parse_asn1_5.1.5.tgz"; + name = "parse_asn1___parse_asn1_5.1.6.tgz"; + path = fetchurl { + name = "parse_asn1___parse_asn1_5.1.6.tgz"; + url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz"; + sha1 = "385080a3ec13cb62a62d39409cb3e88844cdaed4"; + }; + } + { + name = "parse_entities___parse_entities_2.0.0.tgz"; path = fetchurl { - name = "parse_asn1___parse_asn1_5.1.5.tgz"; - url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz"; - sha1 = "003271343da58dc94cace494faef3d2147ecea0e"; + name = "parse_entities___parse_entities_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz"; + sha1 = "53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"; }; } { @@ -7970,6 +8514,14 @@ }; } { + name = "parse_json___parse_json_5.1.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz"; + sha1 = "f96088cdf24a8faa9aea9a009f2d9d942c999646"; + }; + } + { name = "parse_passwd___parse_passwd_1.0.0.tgz"; path = fetchurl { name = "parse_passwd___parse_passwd_1.0.0.tgz"; @@ -7994,6 +8546,14 @@ }; } { + name = "parseqs___parseqs_0.0.6.tgz"; + path = fetchurl { + name = "parseqs___parseqs_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz"; + sha1 = "8e4bb5a19d1cdc844a08ac974d34e273afa670d5"; + }; + } + { name = "parseuri___parseuri_0.0.5.tgz"; path = fetchurl { name = "parseuri___parseuri_0.0.5.tgz"; @@ -8002,6 +8562,14 @@ }; } { + name = "parseuri___parseuri_0.0.6.tgz"; + path = fetchurl { + name = "parseuri___parseuri_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz"; + sha1 = "e1496e829e3ac2ff47f39a4dd044b32823c4a25a"; + }; + } + { name = "parseurl___parseurl_1.3.3.tgz"; path = fetchurl { name = "parseurl___parseurl_1.3.3.tgz"; @@ -8010,6 +8578,14 @@ }; } { + name = "pascal_case___pascal_case_3.1.1.tgz"; + path = fetchurl { + name = "pascal_case___pascal_case_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz"; + sha1 = "5ac1975133ed619281e88920973d2cd1f279de5f"; + }; + } + { name = "pascalcase___pascalcase_0.1.1.tgz"; path = fetchurl { name = "pascalcase___pascalcase_0.1.1.tgz"; @@ -8058,11 +8634,11 @@ }; } { - name = "passport_ldapauth___passport_ldapauth_2.1.3.tgz"; + name = "passport_ldapauth___passport_ldapauth_2.1.4.tgz"; path = fetchurl { - name = "passport_ldapauth___passport_ldapauth_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/passport-ldapauth/-/passport-ldapauth-2.1.3.tgz"; - sha1 = "833530c31c1e2f8d2ab7a1ff97339291074dc6f6"; + name = "passport_ldapauth___passport_ldapauth_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/passport-ldapauth/-/passport-ldapauth-2.1.4.tgz"; + sha1 = "2259e4e5d2d9c2b3d50a04f6640a941effda8da9"; }; } { @@ -8098,11 +8674,11 @@ }; } { - name = "passport_saml___passport_saml_1.3.2.tgz"; + name = "passport_saml___passport_saml_1.5.0.tgz"; path = fetchurl { - name = "passport_saml___passport_saml_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-1.3.2.tgz"; - sha1 = "6cd7e747d7fd0283877d9f48b84c55908ab4182b"; + name = "passport_saml___passport_saml_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-1.5.0.tgz"; + sha1 = "4f22526b577987fb2304219c29e05d2172fca5cf"; }; } { @@ -8162,6 +8738,14 @@ }; } { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + }; + } + { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; path = fetchurl { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; @@ -8210,11 +8794,11 @@ }; } { - name = "path_type___path_type_3.0.0.tgz"; + name = "path_type___path_type_4.0.0.tgz"; path = fetchurl { - name = "path_type___path_type_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz"; - sha1 = "cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"; + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; }; } { @@ -8226,27 +8810,27 @@ }; } { - name = "pbkdf2___pbkdf2_3.0.17.tgz"; + name = "pbkdf2___pbkdf2_3.1.1.tgz"; path = fetchurl { - name = "pbkdf2___pbkdf2_3.0.17.tgz"; - url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz"; - sha1 = "976c206530617b14ebb32114239f7b09336e93a6"; + name = "pbkdf2___pbkdf2_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz"; + sha1 = "cb8724b0fada984596856d1a6ebafd3584654b94"; }; } { - name = "pdfobject___pdfobject_2.1.1.tgz"; + name = "pdfobject___pdfobject_2.2.4.tgz"; path = fetchurl { - name = "pdfobject___pdfobject_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/pdfobject/-/pdfobject-2.1.1.tgz"; - sha1 = "2949d4d218d130d16b6149c7f7226f0a73400d4a"; + name = "pdfobject___pdfobject_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/pdfobject/-/pdfobject-2.2.4.tgz"; + sha1 = "ccb3c191129298a471e9ccb59c88a3ee0b7c7530"; }; } { - name = "pend___pend_1.2.0.tgz"; + name = "peek_readable___peek_readable_3.1.0.tgz"; path = fetchurl { - name = "pend___pend_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; - sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + name = "peek_readable___peek_readable_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/peek-readable/-/peek-readable-3.1.0.tgz"; + sha1 = "250b08b7de09db8573d7fd8ea475215bbff14348"; }; } { @@ -8258,11 +8842,11 @@ }; } { - name = "pg_connection_string___pg_connection_string_0.1.3.tgz"; + name = "pg_connection_string___pg_connection_string_2.4.0.tgz"; path = fetchurl { - name = "pg_connection_string___pg_connection_string_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz"; - sha1 = "da1847b20940e42ee1492beaf65d49d91b245df7"; + name = "pg_connection_string___pg_connection_string_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.4.0.tgz"; + sha1 = "c979922eb47832999a204da5dbe1ebf2341b6a10"; }; } { @@ -8282,19 +8866,19 @@ }; } { - name = "pg_packet_stream___pg_packet_stream_1.1.0.tgz"; + name = "pg_pool___pg_pool_3.2.2.tgz"; path = fetchurl { - name = "pg_packet_stream___pg_packet_stream_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz"; - sha1 = "e45c3ae678b901a2873af1e17b92d787962ef914"; + name = "pg_pool___pg_pool_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.2.2.tgz"; + sha1 = "a560e433443ed4ad946b84d774b3f22452694dff"; }; } { - name = "pg_pool___pg_pool_2.0.10.tgz"; + name = "pg_protocol___pg_protocol_1.4.0.tgz"; path = fetchurl { - name = "pg_pool___pg_pool_2.0.10.tgz"; - url = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.10.tgz"; - sha1 = "842ee23b04e86824ce9d786430f8365082d81c4a"; + name = "pg_protocol___pg_protocol_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.4.0.tgz"; + sha1 = "43a71a92f6fe3ac559952555aa3335c8cb4908be"; }; } { @@ -8306,27 +8890,27 @@ }; } { - name = "pg___pg_7.18.1.tgz"; + name = "pg___pg_8.5.1.tgz"; path = fetchurl { - name = "pg___pg_7.18.1.tgz"; - url = "https://registry.yarnpkg.com/pg/-/pg-7.18.1.tgz"; - sha1 = "67f59c47a99456fcb34f9fe53662b79d4a992f6d"; + name = "pg___pg_8.5.1.tgz"; + url = "https://registry.yarnpkg.com/pg/-/pg-8.5.1.tgz"; + sha1 = "34dcb15f6db4a29c702bf5031ef2e1e25a06a120"; }; } { - name = "pgpass___pgpass_1.0.2.tgz"; + name = "pgpass___pgpass_1.0.4.tgz"; path = fetchurl { - name = "pgpass___pgpass_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz"; - sha1 = "2a7bb41b6065b67907e91da1b07c1847c877b306"; + name = "pgpass___pgpass_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.4.tgz"; + sha1 = "85eb93a83800b20f8057a2b029bf05abaf94ea9c"; }; } { - name = "phantomjs_prebuilt___phantomjs_prebuilt_2.1.16.tgz"; + name = "picomatch___picomatch_2.2.2.tgz"; path = fetchurl { - name = "phantomjs_prebuilt___phantomjs_prebuilt_2.1.16.tgz"; - url = "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz"; - sha1 = "efd212a4a3966d3647684ea8ba788549be2aefef"; + name = "picomatch___picomatch_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; + sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; }; } { @@ -8354,22 +8938,6 @@ }; } { - name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; - path = fetchurl { - name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; - }; - } - { - name = "pinkie___pinkie_2.0.4.tgz"; - path = fetchurl { - name = "pinkie___pinkie_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; - }; - } - { name = "pkg_dir___pkg_dir_2.0.0.tgz"; path = fetchurl { name = "pkg_dir___pkg_dir_2.0.0.tgz"; @@ -8386,6 +8954,14 @@ }; } { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + }; + } + { name = "pkginfo___pkginfo_0.2.3.tgz"; path = fetchurl { name = "pkginfo___pkginfo_0.2.3.tgz"; @@ -8394,6 +8970,22 @@ }; } { + name = "please_upgrade_node___please_upgrade_node_3.2.0.tgz"; + path = fetchurl { + name = "please_upgrade_node___please_upgrade_node_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz"; + sha1 = "aeddd3f994c933e4ad98b99d9a556efa0e2fe942"; + }; + } + { + name = "pluralize___pluralize_8.0.0.tgz"; + path = fetchurl { + name = "pluralize___pluralize_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz"; + sha1 = "1a6fa16a38d12a1901e0320fa017051c539ce3b1"; + }; + } + { name = "pn___pn_1.1.0.tgz"; path = fetchurl { name = "pn___pn_1.1.0.tgz"; @@ -8418,11 +9010,11 @@ }; } { - name = "postcss_calc___postcss_calc_7.0.1.tgz"; + name = "postcss_calc___postcss_calc_7.0.5.tgz"; path = fetchurl { - name = "postcss_calc___postcss_calc_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.1.tgz"; - sha1 = "36d77bab023b0ecbb9789d84dcb23c4941145436"; + name = "postcss_calc___postcss_calc_7.0.5.tgz"; + url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz"; + sha1 = "f8a6e99f12e619c2ebc23cf6c486fdc15860933e"; }; } { @@ -8530,19 +9122,19 @@ }; } { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz"; + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.3.tgz"; path = fetchurl { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz"; - sha1 = "e8a6561be914aaf3c052876377524ca90dbb7915"; + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz"; + sha1 = "bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0"; }; } { - name = "postcss_modules_scope___postcss_modules_scope_2.1.1.tgz"; + name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz"; path = fetchurl { - name = "postcss_modules_scope___postcss_modules_scope_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz"; - sha1 = "33d4fc946602eb5e9355c4165d68a10727689dba"; + name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz"; + sha1 = "385cae013cc7743f5a7d7602d1073a89eaae62ee"; }; } { @@ -8658,19 +9250,11 @@ }; } { - name = "postcss_selector_parser___postcss_selector_parser_5.0.0.tgz"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz"; path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz"; - sha1 = "249044356697b33b64f1a8f7c80922dddee7195c"; - }; - } - { - name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz"; - path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz"; - sha1 = "934cf799d016c83411859e09dcecade01286ec5c"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz"; + sha1 = "56075a1380a04604c38b063ea7767a129af5c2b3"; }; } { @@ -8698,19 +9282,19 @@ }; } { - name = "postcss_value_parser___postcss_value_parser_4.0.2.tgz"; + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; path = fetchurl { - name = "postcss_value_parser___postcss_value_parser_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz"; - sha1 = "482282c09a42706d1fc9a069b73f44ec08391dc9"; + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha1 = "443f6a20ced6481a2bda4fa8532a6e55d789a2cb"; }; } { - name = "postcss___postcss_7.0.26.tgz"; + name = "postcss___postcss_7.0.35.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.26.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.26.tgz"; - sha1 = "5ed615cfcab35ba9bbb82414a4fa88ea10429587"; + name = "postcss___postcss_7.0.35.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz"; + sha1 = "d2be00b998f7f211d8a276974079f2e92b970e24"; }; } { @@ -8730,11 +9314,11 @@ }; } { - name = "postgres_date___postgres_date_1.0.4.tgz"; + name = "postgres_date___postgres_date_1.0.7.tgz"; path = fetchurl { - name = "postgres_date___postgres_date_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.4.tgz"; - sha1 = "1c2728d62ef1bff49abdd35c1f86d4bdf118a728"; + name = "postgres_date___postgres_date_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz"; + sha1 = "51bc086006005e5061c591cee727f2531bf641a8"; }; } { @@ -8778,19 +9362,27 @@ }; } { - name = "pretty_error___pretty_error_2.1.1.tgz"; + name = "pretty_error___pretty_error_2.1.2.tgz"; + path = fetchurl { + name = "pretty_error___pretty_error_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz"; + sha1 = "be89f82d81b1c86ec8fdfbc385045882727f93b6"; + }; + } + { + name = "printj___printj_1.1.2.tgz"; path = fetchurl { - name = "pretty_error___pretty_error_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz"; - sha1 = "5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"; + name = "printj___printj_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz"; + sha1 = "d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"; }; } { - name = "prismjs___prismjs_1.19.0.tgz"; + name = "prismjs___prismjs_1.22.0.tgz"; path = fetchurl { - name = "prismjs___prismjs_1.19.0.tgz"; - url = "https://registry.yarnpkg.com/prismjs/-/prismjs-1.19.0.tgz"; - sha1 = "713afbd45c3baca4b321569f2df39e17e729d4dc"; + name = "prismjs___prismjs_1.22.0.tgz"; + url = "https://registry.yarnpkg.com/prismjs/-/prismjs-1.22.0.tgz"; + sha1 = "73c3400afc58a823dd7eed023f8e1ce9fd8977fa"; }; } { @@ -8826,14 +9418,6 @@ }; } { - name = "progress___progress_1.1.8.tgz"; - path = fetchurl { - name = "progress___progress_1.1.8.tgz"; - url = "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz"; - sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; - }; - } - { name = "progress___progress_2.0.3.tgz"; path = fetchurl { name = "progress___progress_2.0.3.tgz"; @@ -8850,14 +9434,6 @@ }; } { - name = "promise___promise_7.3.1.tgz"; - path = fetchurl { - name = "promise___promise_7.3.1.tgz"; - url = "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz"; - sha1 = "064b72602b18f90f29192b8b1bc418ffd1ebd3bf"; - }; - } - { name = "proto_list___proto_list_1.2.4.tgz"; path = fetchurl { name = "proto_list___proto_list_1.2.4.tgz"; @@ -8866,11 +9442,11 @@ }; } { - name = "proxy_addr___proxy_addr_2.0.5.tgz"; + name = "proxy_addr___proxy_addr_2.0.6.tgz"; path = fetchurl { - name = "proxy_addr___proxy_addr_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz"; - sha1 = "34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"; + name = "proxy_addr___proxy_addr_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz"; + sha1 = "fdc2336505447d3f2f2c638ed272caf614bbb2bf"; }; } { @@ -8890,11 +9466,11 @@ }; } { - name = "psl___psl_1.7.0.tgz"; + name = "psl___psl_1.8.0.tgz"; path = fetchurl { - name = "psl___psl_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz"; - sha1 = "f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"; + name = "psl___psl_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz"; + sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24"; }; } { @@ -9042,11 +9618,11 @@ }; } { - name = "randomcolor___randomcolor_0.5.4.tgz"; + name = "randomcolor___randomcolor_0.6.2.tgz"; path = fetchurl { - name = "randomcolor___randomcolor_0.5.4.tgz"; - url = "https://registry.yarnpkg.com/randomcolor/-/randomcolor-0.5.4.tgz"; - sha1 = "df615b13f25b89ea58c5f8f72647f0a6f07adcc3"; + name = "randomcolor___randomcolor_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/randomcolor/-/randomcolor-0.6.2.tgz"; + sha1 = "7a57362ae1a1278439aeed2c15e5deb8ea33f56d"; }; } { @@ -9066,14 +9642,6 @@ }; } { - name = "raphael___raphael_2.2.8.tgz"; - path = fetchurl { - name = "raphael___raphael_2.2.8.tgz"; - url = "https://registry.yarnpkg.com/raphael/-/raphael-2.2.8.tgz"; - sha1 = "4b18443c2c6030c3b492d8d11fbbca14ebe4d3f3"; - }; - } - { name = "raphael___raphael_2.3.0.tgz"; path = fetchurl { name = "raphael___raphael_2.3.0.tgz"; @@ -9082,22 +9650,6 @@ }; } { - name = "raphael"; - path = - let - repo = fetchgit { - url = "https://github.com/dmitrybaranovskiy/raphael"; - rev = "d8fbe4be81d362837f95e33886b80fb41de443b4"; - sha256 = "1g2jif250j3szn75fivns8d66m9s7msivhdh4jqbbmy8mvv8xzn9"; - }; - in - runCommandNoCC "raphael" { buildInputs = [gnutar]; } '' - # Set u+w because tar-fs can't unpack archives with read-only dirs - # https://github.com/mafintosh/tar-fs/issues/79 - tar cf $out --mode u+w -C ${repo} . - ''; - } - { name = "raw_body___raw_body_2.4.0.tgz"; path = fetchurl { name = "raw_body___raw_body_2.4.0.tgz"; @@ -9154,14 +9706,6 @@ }; } { - name = "readable_stream___readable_stream_3.6.0.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; - sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; - }; - } - { name = "readable_stream___readable_stream_1.0.34.tgz"; path = fetchurl { name = "readable_stream___readable_stream_1.0.34.tgz"; @@ -9170,6 +9714,14 @@ }; } { + name = "readable_stream___readable_stream_3.6.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + }; + } + { name = "readable_stream___readable_stream_2.0.6.tgz"; path = fetchurl { name = "readable_stream___readable_stream_2.0.6.tgz"; @@ -9178,6 +9730,22 @@ }; } { + name = "readable_web_to_node_stream___readable_web_to_node_stream_3.0.0.tgz"; + path = fetchurl { + name = "readable_web_to_node_stream___readable_web_to_node_stream_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.0.tgz"; + sha1 = "4ca5408e70471069119d691934141a52de413955"; + }; + } + { + name = "readdir_glob___readdir_glob_1.1.1.tgz"; + path = fetchurl { + name = "readdir_glob___readdir_glob_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz"; + sha1 = "f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4"; + }; + } + { name = "readdirp___readdirp_2.2.1.tgz"; path = fetchurl { name = "readdirp___readdirp_2.2.1.tgz"; @@ -9186,19 +9754,19 @@ }; } { - name = "readline_sync___readline_sync_1.4.10.tgz"; + name = "readdirp___readdirp_3.5.0.tgz"; path = fetchurl { - name = "readline_sync___readline_sync_1.4.10.tgz"; - url = "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz"; - sha1 = "41df7fbb4b6312d673011594145705bf56d8873b"; + name = "readdirp___readdirp_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz"; + sha1 = "9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"; }; } { - name = "redeyed___redeyed_2.1.1.tgz"; + name = "readline_sync___readline_sync_1.4.10.tgz"; path = fetchurl { - name = "redeyed___redeyed_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/redeyed/-/redeyed-2.1.1.tgz"; - sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; + name = "readline_sync___readline_sync_1.4.10.tgz"; + url = "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz"; + sha1 = "41df7fbb4b6312d673011594145705bf56d8873b"; }; } { @@ -9218,19 +9786,11 @@ }; } { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; + name = "regenerate___regenerate_1.4.2.tgz"; path = fetchurl { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz"; - sha1 = "ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"; - }; - } - { - name = "regenerate___regenerate_1.4.0.tgz"; - path = fetchurl { - name = "regenerate___regenerate_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz"; - sha1 = "4a856ec4b56e4077c557589cae85e7a4c8869a11"; + name = "regenerate___regenerate_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz"; + sha1 = "b9346d8827e8f5a32f7ba29637d398b69014848a"; }; } { @@ -9298,14 +9858,6 @@ }; } { - name = "regexpu_core___regexpu_core_4.6.0.tgz"; - path = fetchurl { - name = "regexpu_core___regexpu_core_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz"; - sha1 = "2037c18b327cfce8a6fea2a4ec441f2432afb8b6"; - }; - } - { name = "regjsgen___regjsgen_0.2.0.tgz"; path = fetchurl { name = "regjsgen___regjsgen_0.2.0.tgz"; @@ -9314,14 +9866,6 @@ }; } { - name = "regjsgen___regjsgen_0.5.1.tgz"; - path = fetchurl { - name = "regjsgen___regjsgen_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz"; - sha1 = "48f0bf1a5ea205196929c0d9798b42d1ed98443c"; - }; - } - { name = "regjsparser___regjsparser_0.1.5.tgz"; path = fetchurl { name = "regjsparser___regjsparser_0.1.5.tgz"; @@ -9330,14 +9874,6 @@ }; } { - name = "regjsparser___regjsparser_0.6.3.tgz"; - path = fetchurl { - name = "regjsparser___regjsparser_0.6.3.tgz"; - url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz"; - sha1 = "74192c5805d35e9f5ebe3c1fb5b40d40a8a38460"; - }; - } - { name = "relateurl___relateurl_0.2.7.tgz"; path = fetchurl { name = "relateurl___relateurl_0.2.7.tgz"; @@ -9346,11 +9882,411 @@ }; } { - name = "remarkable___remarkable_2.0.0.tgz"; + name = "remark_cli___remark_cli_8.0.1.tgz"; + path = fetchurl { + name = "remark_cli___remark_cli_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-cli/-/remark-cli-8.0.1.tgz"; + sha1 = "093e9f27c1d56a591f4c44c017de5749d4e79a08"; + }; + } + { + name = "remark_lint_blockquote_indentation___remark_lint_blockquote_indentation_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_blockquote_indentation___remark_lint_blockquote_indentation_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-2.0.1.tgz"; + sha1 = "27347959acf42a6c3e401488d8210e973576b254"; + }; + } + { + name = "remark_lint_code_block_style___remark_lint_code_block_style_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_code_block_style___remark_lint_code_block_style_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-code-block-style/-/remark-lint-code-block-style-2.0.1.tgz"; + sha1 = "448b0f2660acfcdfff2138d125ff5b1c1279c0cb"; + }; + } + { + name = "remark_lint_definition_case___remark_lint_definition_case_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_definition_case___remark_lint_definition_case_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-definition-case/-/remark-lint-definition-case-2.0.1.tgz"; + sha1 = "10340eb2f87acff41140d52ad7e5b40b47e6690a"; + }; + } + { + name = "remark_lint_definition_spacing___remark_lint_definition_spacing_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_definition_spacing___remark_lint_definition_spacing_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-definition-spacing/-/remark-lint-definition-spacing-2.0.1.tgz"; + sha1 = "97f01bf9bf77a7bdf8013b124b7157dd90b07c64"; + }; + } + { + name = "remark_lint_emphasis_marker___remark_lint_emphasis_marker_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_emphasis_marker___remark_lint_emphasis_marker_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-emphasis-marker/-/remark-lint-emphasis-marker-2.0.1.tgz"; + sha1 = "1d5ca2070d4798d16c23120726158157796dc317"; + }; + } + { + name = "remark_lint_fenced_code_flag___remark_lint_fenced_code_flag_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_fenced_code_flag___remark_lint_fenced_code_flag_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-fenced-code-flag/-/remark-lint-fenced-code-flag-2.0.1.tgz"; + sha1 = "2cb3ddb1157082c45760c7d01ca08e13376aaf62"; + }; + } + { + name = "remark_lint_fenced_code_marker___remark_lint_fenced_code_marker_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_fenced_code_marker___remark_lint_fenced_code_marker_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-2.0.1.tgz"; + sha1 = "7bbeb0fb45b0818a3c8a2d232cf0c723ade58ecf"; + }; + } + { + name = "remark_lint_file_extension___remark_lint_file_extension_1.0.5.tgz"; + path = fetchurl { + name = "remark_lint_file_extension___remark_lint_file_extension_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-file-extension/-/remark-lint-file-extension-1.0.5.tgz"; + sha1 = "7e2feec02919aa3db5c71fda19d726a9e24a4c6c"; + }; + } + { + name = "remark_lint_final_definition___remark_lint_final_definition_2.1.0.tgz"; + path = fetchurl { + name = "remark_lint_final_definition___remark_lint_final_definition_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-final-definition/-/remark-lint-final-definition-2.1.0.tgz"; + sha1 = "b6e654c01ebcb1afc936d7b9cd74db8ec273e0bb"; + }; + } + { + name = "remark_lint_hard_break_spaces___remark_lint_hard_break_spaces_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_hard_break_spaces___remark_lint_hard_break_spaces_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-2.0.1.tgz"; + sha1 = "2149b55cda17604562d040c525a2a0d26aeb0f0f"; + }; + } + { + name = "remark_lint_heading_increment___remark_lint_heading_increment_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_heading_increment___remark_lint_heading_increment_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-heading-increment/-/remark-lint-heading-increment-2.0.1.tgz"; + sha1 = "b578f251508a05d79bc2d1ae941e0620e23bf1d3"; + }; + } + { + name = "remark_lint_heading_style___remark_lint_heading_style_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_heading_style___remark_lint_heading_style_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-heading-style/-/remark-lint-heading-style-2.0.1.tgz"; + sha1 = "8216fca67d97bbbeec8a19b6c71bfefc16549f72"; + }; + } + { + name = "remark_lint_link_title_style___remark_lint_link_title_style_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_link_title_style___remark_lint_link_title_style_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-link-title-style/-/remark-lint-link-title-style-2.0.1.tgz"; + sha1 = "51a595c69fcfa73a245a030dfaa3504938a1173a"; + }; + } + { + name = "remark_lint_list_item_content_indent___remark_lint_list_item_content_indent_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_list_item_content_indent___remark_lint_list_item_content_indent_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-list-item-content-indent/-/remark-lint-list-item-content-indent-2.0.1.tgz"; + sha1 = "96387459440dcd61e522ab02bff138b32bfaa63a"; + }; + } + { + name = "remark_lint_list_item_indent___remark_lint_list_item_indent_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_list_item_indent___remark_lint_list_item_indent_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-list-item-indent/-/remark-lint-list-item-indent-2.0.1.tgz"; + sha1 = "c6472514e17bc02136ca87936260407ada90bf8d"; + }; + } + { + name = "remark_lint_list_item_spacing___remark_lint_list_item_spacing_2.0.1.tgz"; path = fetchurl { - name = "remarkable___remarkable_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/remarkable/-/remarkable-2.0.0.tgz"; - sha1 = "795f965bede8300362ce51a716edc322d9e7a4ca"; + name = "remark_lint_list_item_spacing___remark_lint_list_item_spacing_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-list-item-spacing/-/remark-lint-list-item-spacing-2.0.1.tgz"; + sha1 = "864ddda464d5cd11f725c83f00bb240538661d50"; + }; + } + { + name = "remark_lint_maximum_heading_length___remark_lint_maximum_heading_length_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_maximum_heading_length___remark_lint_maximum_heading_length_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-maximum-heading-length/-/remark-lint-maximum-heading-length-2.0.1.tgz"; + sha1 = "56f240707a75b59bce3384ccc9da94548affa98f"; + }; + } + { + name = "remark_lint_maximum_line_length___remark_lint_maximum_line_length_2.0.3.tgz"; + path = fetchurl { + name = "remark_lint_maximum_line_length___remark_lint_maximum_line_length_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-maximum-line-length/-/remark-lint-maximum-line-length-2.0.3.tgz"; + sha1 = "d0d15410637d61b031a83d7c78022ec46d6c858a"; + }; + } + { + name = "remark_lint_no_auto_link_without_protocol___remark_lint_no_auto_link_without_protocol_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_no_auto_link_without_protocol___remark_lint_no_auto_link_without_protocol_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-auto-link-without-protocol/-/remark-lint-no-auto-link-without-protocol-2.0.1.tgz"; + sha1 = "f75e5c24adb42385593e0d75ca39987edb70b6c4"; + }; + } + { + name = "remark_lint_no_blockquote_without_marker___remark_lint_no_blockquote_without_marker_3.0.1.tgz"; + path = fetchurl { + name = "remark_lint_no_blockquote_without_marker___remark_lint_no_blockquote_without_marker_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-3.0.1.tgz"; + sha1 = "fb1d5a87ee6f21b731bb2ee52df55632c519a5eb"; + }; + } + { + name = "remark_lint_no_consecutive_blank_lines___remark_lint_no_consecutive_blank_lines_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_no_consecutive_blank_lines___remark_lint_no_consecutive_blank_lines_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-consecutive-blank-lines/-/remark-lint-no-consecutive-blank-lines-2.0.1.tgz"; + sha1 = "4163fa21619fe69325333f83eed8a933ed32e7ec"; + }; + } + { + name = "remark_lint_no_duplicate_headings___remark_lint_no_duplicate_headings_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_no_duplicate_headings___remark_lint_no_duplicate_headings_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-duplicate-headings/-/remark-lint-no-duplicate-headings-2.0.1.tgz"; + sha1 = "4a4b70e029155ebcfc03d8b2358c427b69a87576"; + }; + } + { + name = "remark_lint_no_emphasis_as_heading___remark_lint_no_emphasis_as_heading_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_no_emphasis_as_heading___remark_lint_no_emphasis_as_heading_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-emphasis-as-heading/-/remark-lint-no-emphasis-as-heading-2.0.1.tgz"; + sha1 = "fcc064133fe00745943c334080fed822f72711ea"; + }; + } + { + name = "remark_lint_no_file_name_articles___remark_lint_no_file_name_articles_1.0.5.tgz"; + path = fetchurl { + name = "remark_lint_no_file_name_articles___remark_lint_no_file_name_articles_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-file-name-articles/-/remark-lint-no-file-name-articles-1.0.5.tgz"; + sha1 = "4ca3425f6613f94feaef6941028583299727c339"; + }; + } + { + name = "remark_lint_no_file_name_consecutive_dashes___remark_lint_no_file_name_consecutive_dashes_1.0.5.tgz"; + path = fetchurl { + name = "remark_lint_no_file_name_consecutive_dashes___remark_lint_no_file_name_consecutive_dashes_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-file-name-consecutive-dashes/-/remark-lint-no-file-name-consecutive-dashes-1.0.5.tgz"; + sha1 = "e9a6f2aeab948aa249c8a8356359e3d8843a4c5c"; + }; + } + { + name = "remark_lint_no_file_name_irregular_characters___remark_lint_no_file_name_irregular_characters_1.0.5.tgz"; + path = fetchurl { + name = "remark_lint_no_file_name_irregular_characters___remark_lint_no_file_name_irregular_characters_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-file-name-irregular-characters/-/remark-lint-no-file-name-irregular-characters-1.0.5.tgz"; + sha1 = "6866f5b8370cdc916d55e7cf87bb6a55f9b6e0c6"; + }; + } + { + name = "remark_lint_no_file_name_mixed_case___remark_lint_no_file_name_mixed_case_1.0.5.tgz"; + path = fetchurl { + name = "remark_lint_no_file_name_mixed_case___remark_lint_no_file_name_mixed_case_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-file-name-mixed-case/-/remark-lint-no-file-name-mixed-case-1.0.5.tgz"; + sha1 = "3e37bfef74bbdd4b07aa9ef9dd452758f8b46731"; + }; + } + { + name = "remark_lint_no_file_name_outer_dashes___remark_lint_no_file_name_outer_dashes_1.0.6.tgz"; + path = fetchurl { + name = "remark_lint_no_file_name_outer_dashes___remark_lint_no_file_name_outer_dashes_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-file-name-outer-dashes/-/remark-lint-no-file-name-outer-dashes-1.0.6.tgz"; + sha1 = "4e0e4d42a63f0fdfb856bb5d8d8112725656e700"; + }; + } + { + name = "remark_lint_no_heading_punctuation___remark_lint_no_heading_punctuation_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_no_heading_punctuation___remark_lint_no_heading_punctuation_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-heading-punctuation/-/remark-lint-no-heading-punctuation-2.0.1.tgz"; + sha1 = "face59f9a95c8aa278a8ee0c728bc44cd53ea9ed"; + }; + } + { + name = "remark_lint_no_inline_padding___remark_lint_no_inline_padding_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_no_inline_padding___remark_lint_no_inline_padding_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-inline-padding/-/remark-lint-no-inline-padding-2.0.1.tgz"; + sha1 = "630b546566d34bde87943da318a80fc7ff856f1f"; + }; + } + { + name = "remark_lint_no_literal_urls___remark_lint_no_literal_urls_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_no_literal_urls___remark_lint_no_literal_urls_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-literal-urls/-/remark-lint-no-literal-urls-2.0.1.tgz"; + sha1 = "731908f9866c1880e6024dcee1269fb0f40335d6"; + }; + } + { + name = "remark_lint_no_multiple_toplevel_headings___remark_lint_no_multiple_toplevel_headings_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_no_multiple_toplevel_headings___remark_lint_no_multiple_toplevel_headings_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-2.0.1.tgz"; + sha1 = "3ff2b505adf720f4ff2ad2b1021f8cfd50ad8635"; + }; + } + { + name = "remark_lint_no_shell_dollars___remark_lint_no_shell_dollars_2.0.2.tgz"; + path = fetchurl { + name = "remark_lint_no_shell_dollars___remark_lint_no_shell_dollars_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-2.0.2.tgz"; + sha1 = "b2c6c3ed95e5615f8e5f031c7d271a18dc17618e"; + }; + } + { + name = "remark_lint_no_shortcut_reference_image___remark_lint_no_shortcut_reference_image_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_no_shortcut_reference_image___remark_lint_no_shortcut_reference_image_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-shortcut-reference-image/-/remark-lint-no-shortcut-reference-image-2.0.1.tgz"; + sha1 = "d174d12a57e8307caf6232f61a795bc1d64afeaa"; + }; + } + { + name = "remark_lint_no_shortcut_reference_link___remark_lint_no_shortcut_reference_link_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_no_shortcut_reference_link___remark_lint_no_shortcut_reference_link_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-shortcut-reference-link/-/remark-lint-no-shortcut-reference-link-2.0.1.tgz"; + sha1 = "8f963f81036e45cfb7061b3639e9c6952308bc94"; + }; + } + { + name = "remark_lint_no_table_indentation___remark_lint_no_table_indentation_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_no_table_indentation___remark_lint_no_table_indentation_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-2.0.1.tgz"; + sha1 = "67ef344389fa40be9c6017835cf58ca417c417d0"; + }; + } + { + name = "remark_lint_ordered_list_marker_style___remark_lint_ordered_list_marker_style_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_ordered_list_marker_style___remark_lint_ordered_list_marker_style_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-2.0.1.tgz"; + sha1 = "183c31967e6f2ae8ef00effad03633f7fd00ffaa"; + }; + } + { + name = "remark_lint_ordered_list_marker_value___remark_lint_ordered_list_marker_value_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_ordered_list_marker_value___remark_lint_ordered_list_marker_value_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-value/-/remark-lint-ordered-list-marker-value-2.0.1.tgz"; + sha1 = "0de343de2efb41f01eae9f0f7e7d30fe43db5595"; + }; + } + { + name = "remark_lint_rule_style___remark_lint_rule_style_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_rule_style___remark_lint_rule_style_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-rule-style/-/remark-lint-rule-style-2.0.1.tgz"; + sha1 = "f59bd82e75d3eaabd0eee1c8c0f5513372eb553c"; + }; + } + { + name = "remark_lint_strong_marker___remark_lint_strong_marker_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_strong_marker___remark_lint_strong_marker_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-strong-marker/-/remark-lint-strong-marker-2.0.1.tgz"; + sha1 = "1ad8f190c6ac0f8138b638965ccf3bcd18f6d4e4"; + }; + } + { + name = "remark_lint_table_cell_padding___remark_lint_table_cell_padding_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_table_cell_padding___remark_lint_table_cell_padding_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-2.0.1.tgz"; + sha1 = "b1e557ec44e1a33beb45578e97bf9441149379f6"; + }; + } + { + name = "remark_lint_table_pipe_alignment___remark_lint_table_pipe_alignment_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_table_pipe_alignment___remark_lint_table_pipe_alignment_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-2.0.1.tgz"; + sha1 = "12b7e4c54473d69c9866cb33439c718d09cffcc5"; + }; + } + { + name = "remark_lint_table_pipes___remark_lint_table_pipes_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_table_pipes___remark_lint_table_pipes_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-table-pipes/-/remark-lint-table-pipes-2.0.1.tgz"; + sha1 = "b8594394f65053a030e8a51baa8504e388139a19"; + }; + } + { + name = "remark_lint_unordered_list_marker_style___remark_lint_unordered_list_marker_style_2.0.1.tgz"; + path = fetchurl { + name = "remark_lint_unordered_list_marker_style___remark_lint_unordered_list_marker_style_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-2.0.1.tgz"; + sha1 = "e64692aa9594dbe7e945ae76ab2218949cd92477"; + }; + } + { + name = "remark_lint___remark_lint_7.0.1.tgz"; + path = fetchurl { + name = "remark_lint___remark_lint_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint/-/remark-lint-7.0.1.tgz"; + sha1 = "665a5cbea9f7c95e64593f69bb6816ee8343ffdf"; + }; + } + { + name = "remark_message_control___remark_message_control_6.0.0.tgz"; + path = fetchurl { + name = "remark_message_control___remark_message_control_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/remark-message-control/-/remark-message-control-6.0.0.tgz"; + sha1 = "955b054b38c197c9f2e35b1d88a4912949db7fc5"; + }; + } + { + name = "remark_parse___remark_parse_8.0.3.tgz"; + path = fetchurl { + name = "remark_parse___remark_parse_8.0.3.tgz"; + url = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.3.tgz"; + sha1 = "9c62aa3b35b79a486454c690472906075f40c7e1"; + }; + } + { + name = "remark_preset_lint_markdown_style_guide___remark_preset_lint_markdown_style_guide_3.0.1.tgz"; + path = fetchurl { + name = "remark_preset_lint_markdown_style_guide___remark_preset_lint_markdown_style_guide_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-preset-lint-markdown-style-guide/-/remark-preset-lint-markdown-style-guide-3.0.1.tgz"; + sha1 = "7f160e2ded777bfb14d544e9f72c6873bdfb6da3"; + }; + } + { + name = "remark_stringify___remark_stringify_8.1.1.tgz"; + path = fetchurl { + name = "remark_stringify___remark_stringify_8.1.1.tgz"; + url = "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-8.1.1.tgz"; + sha1 = "e2a9dc7a7bf44e46a155ec78996db896780d8ce5"; + }; + } + { + name = "remark___remark_12.0.1.tgz"; + path = fetchurl { + name = "remark___remark_12.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark/-/remark-12.0.1.tgz"; + sha1 = "f1ddf68db7be71ca2bad0a33cd3678b86b9c709f"; }; } { @@ -9362,11 +10298,11 @@ }; } { - name = "renderkid___renderkid_2.0.3.tgz"; + name = "renderkid___renderkid_2.0.4.tgz"; path = fetchurl { - name = "renderkid___renderkid_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.3.tgz"; - sha1 = "380179c2ff5ae1365c522bf2fcfcff01c5b74149"; + name = "renderkid___renderkid_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.4.tgz"; + sha1 = "d325e532afb28d3f8796ffee306be8ffd6fc864c"; }; } { @@ -9394,27 +10330,27 @@ }; } { - name = "request_progress___request_progress_2.0.1.tgz"; + name = "replace_ext___replace_ext_1.0.0.tgz"; path = fetchurl { - name = "request_progress___request_progress_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz"; - sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; + name = "replace_ext___replace_ext_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz"; + sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb"; }; } { - name = "request_promise_core___request_promise_core_1.1.3.tgz"; + name = "request_promise_core___request_promise_core_1.1.4.tgz"; path = fetchurl { - name = "request_promise_core___request_promise_core_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz"; - sha1 = "e9a3c081b51380dfea677336061fea879a829ee9"; + name = "request_promise_core___request_promise_core_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz"; + sha1 = "3eedd4223208d419867b78ce815167d10593a22f"; }; } { - name = "request_promise_native___request_promise_native_1.0.8.tgz"; + name = "request_promise_native___request_promise_native_1.0.9.tgz"; path = fetchurl { - name = "request_promise_native___request_promise_native_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz"; - sha1 = "a455b960b826e44e2bf8999af64dff2bfe58cb36"; + name = "request_promise_native___request_promise_native_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz"; + sha1 = "e407120526a5efdc9a39b28a5679bf47b9d9dc28"; }; } { @@ -9442,14 +10378,6 @@ }; } { - name = "require_relative___require_relative_0.8.7.tgz"; - path = fetchurl { - name = "require_relative___require_relative_0.8.7.tgz"; - url = "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz"; - sha1 = "7999539fc9e047a37928fa196f8e1563dabd36de"; - }; - } - { name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; path = fetchurl { name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; @@ -9482,6 +10410,14 @@ }; } { + name = "resolve_from___resolve_from_5.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz"; + sha1 = "c35225843df8f776df21c57557bc087e9dfdfc69"; + }; + } + { name = "resolve_url___resolve_url_0.2.1.tgz"; path = fetchurl { name = "resolve_url___resolve_url_0.2.1.tgz"; @@ -9490,11 +10426,11 @@ }; } { - name = "resolve___resolve_1.15.1.tgz"; + name = "resolve___resolve_1.19.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.15.1.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz"; - sha1 = "27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"; + name = "resolve___resolve_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz"; + sha1 = "1af5bf630409734a067cae29318aac7fa29a267c"; }; } { @@ -9522,6 +10458,14 @@ }; } { + name = "reusify___reusify_1.0.4.tgz"; + path = fetchurl { + name = "reusify___reusify_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; + sha1 = "90da382b1e126efc02146e90845a88db12925d76"; + }; + } + { name = "reveal.js___reveal.js_3.9.2.tgz"; path = fetchurl { name = "reveal.js___reveal.js_3.9.2.tgz"; @@ -9546,14 +10490,6 @@ }; } { - name = "right_align___right_align_0.1.3.tgz"; - path = fetchurl { - name = "right_align___right_align_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz"; - sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; - }; - } - { name = "rimraf___rimraf_2.6.3.tgz"; path = fetchurl { name = "rimraf___rimraf_2.6.3.tgz"; @@ -9570,6 +10506,14 @@ }; } { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + }; + } + { name = "rimraf___rimraf_2.4.5.tgz"; path = fetchurl { name = "rimraf___rimraf_2.4.5.tgz"; @@ -9586,43 +10530,19 @@ }; } { - name = "rollup_plugin_buble___rollup_plugin_buble_0.19.8.tgz"; + name = "run_async___run_async_2.4.1.tgz"; path = fetchurl { - name = "rollup_plugin_buble___rollup_plugin_buble_0.19.8.tgz"; - url = "https://registry.yarnpkg.com/rollup-plugin-buble/-/rollup-plugin-buble-0.19.8.tgz"; - sha1 = "f9232e2bb62a7573d04f9705c1bd6f02c2a02c6a"; + name = "run_async___run_async_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; + sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; }; } { - name = "rollup_pluginutils___rollup_pluginutils_2.8.2.tgz"; + name = "run_parallel___run_parallel_1.1.10.tgz"; path = fetchurl { - name = "rollup_pluginutils___rollup_pluginutils_2.8.2.tgz"; - url = "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz"; - sha1 = "72f2af0748b592364dbd3389e600e5a9444a351e"; - }; - } - { - name = "rollup_watch___rollup_watch_4.3.1.tgz"; - path = fetchurl { - name = "rollup_watch___rollup_watch_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/rollup-watch/-/rollup-watch-4.3.1.tgz"; - sha1 = "5aa1eaeab787addf368905d102b39d6fc5ce4a8b"; - }; - } - { - name = "rollup___rollup_0.66.6.tgz"; - path = fetchurl { - name = "rollup___rollup_0.66.6.tgz"; - url = "https://registry.yarnpkg.com/rollup/-/rollup-0.66.6.tgz"; - sha1 = "ce7d6185beb7acea644ce220c25e71ae03275482"; - }; - } - { - name = "run_async___run_async_2.3.0.tgz"; - path = fetchurl { - name = "run_async___run_async_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz"; - sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + name = "run_parallel___run_parallel_1.1.10.tgz"; + url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz"; + sha1 = "60a51b2ae836636c81377df16cb107351bcd13ef"; }; } { @@ -9642,19 +10562,19 @@ }; } { - name = "rxjs___rxjs_6.5.4.tgz"; + name = "rxjs___rxjs_6.6.3.tgz"; path = fetchurl { - name = "rxjs___rxjs_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz"; - sha1 = "e0777fe0d184cec7872df147f303572d414e211c"; + name = "rxjs___rxjs_6.6.3.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz"; + sha1 = "8ca84635c4daa900c0d3967a6ee7ac60271ee552"; }; } { - name = "safe_buffer___safe_buffer_5.2.0.tgz"; + name = "safe_buffer___safe_buffer_5.2.1.tgz"; path = fetchurl { - name = "safe_buffer___safe_buffer_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz"; - sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519"; + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; }; } { @@ -9666,6 +10586,14 @@ }; } { + name = "safe_buffer___safe_buffer_5.2.0.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz"; + sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519"; + }; + } + { name = "safe_json_stringify___safe_json_stringify_1.2.0.tgz"; path = fetchurl { name = "safe_json_stringify___safe_json_stringify_1.2.0.tgz"; @@ -9722,19 +10650,19 @@ }; } { - name = "schema_utils___schema_utils_2.6.4.tgz"; + name = "schema_utils___schema_utils_2.7.1.tgz"; path = fetchurl { - name = "schema_utils___schema_utils_2.6.4.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz"; - sha1 = "a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53"; + name = "schema_utils___schema_utils_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz"; + sha1 = "1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"; }; } { - name = "scope_css___scope_css_1.2.1.tgz"; + name = "schema_utils___schema_utils_3.0.0.tgz"; path = fetchurl { - name = "scope_css___scope_css_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/scope-css/-/scope-css-1.2.1.tgz"; - sha1 = "c35768bc900cad030a3e0d663a818c0f6a57f40e"; + name = "schema_utils___schema_utils_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz"; + sha1 = "67502f6aa2b66a2d4032b4279a2944978a0913ef"; }; } { @@ -9778,19 +10706,19 @@ }; } { - name = "semver___semver_5.7.1.tgz"; + name = "semver_compare___semver_compare_1.0.0.tgz"; path = fetchurl { - name = "semver___semver_5.7.1.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; - sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + name = "semver_compare___semver_compare_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; + sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; }; } { - name = "semver___semver_4.3.2.tgz"; + name = "semver___semver_5.7.1.tgz"; path = fetchurl { - name = "semver___semver_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz"; - sha1 = "c7a07158a80bedd052355b770d82d6640f803be7"; + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; }; } { @@ -9834,27 +10762,27 @@ }; } { - name = "sequelize___sequelize_5.21.4.tgz"; + name = "sequelize___sequelize_5.22.3.tgz"; path = fetchurl { - name = "sequelize___sequelize_5.21.4.tgz"; - url = "https://registry.yarnpkg.com/sequelize/-/sequelize-5.21.4.tgz"; - sha1 = "a49597dbd7862e4e1fb8ec819de04705d06d9d17"; + name = "sequelize___sequelize_5.22.3.tgz"; + url = "https://registry.yarnpkg.com/sequelize/-/sequelize-5.22.3.tgz"; + sha1 = "7e7a92ddd355d883c9eb11cdb106d874d0d2636f"; }; } { - name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; + name = "serialize_javascript___serialize_javascript_4.0.0.tgz"; path = fetchurl { - name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; - sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61"; + name = "serialize_javascript___serialize_javascript_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz"; + sha1 = "b525e1238489a5ecfc42afacc3fe99e666f4b1aa"; }; } { - name = "series_stream___series_stream_1.0.1.tgz"; + name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; path = fetchurl { - name = "series_stream___series_stream_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/series-stream/-/series-stream-1.0.1.tgz"; - sha1 = "311a09c5c1d5a091440832e1a480a47400f1005d"; + name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha1 = "7886ec848049a462467a97d3d918ebb2aaf934f4"; }; } { @@ -9930,11 +10858,11 @@ }; } { - name = "shortid___shortid_2.2.8.tgz"; + name = "shortid___shortid_2.2.16.tgz"; path = fetchurl { - name = "shortid___shortid_2.2.8.tgz"; - url = "https://registry.yarnpkg.com/shortid/-/shortid-2.2.8.tgz"; - sha1 = "033b117d6a2e975804f6f0969dbe7d3d0b355131"; + name = "shortid___shortid_2.2.16.tgz"; + url = "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz"; + sha1 = "b742b8f0cb96406fd391c76bfc18a67a57fe5608"; }; } { @@ -9946,11 +10874,11 @@ }; } { - name = "signal_exit___signal_exit_3.0.2.tgz"; + name = "signal_exit___signal_exit_3.0.3.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; }; } { @@ -9970,6 +10898,14 @@ }; } { + name = "slash___slash_3.0.0.tgz"; + path = fetchurl { + name = "slash___slash_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; + sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; + }; + } + { name = "slice_ansi___slice_ansi_2.1.0.tgz"; path = fetchurl { name = "slice_ansi___slice_ansi_2.1.0.tgz"; @@ -9978,11 +10914,11 @@ }; } { - name = "slugify___slugify_1.3.6.tgz"; + name = "sliced___sliced_1.0.1.tgz"; path = fetchurl { - name = "slugify___slugify_1.3.6.tgz"; - url = "https://registry.yarnpkg.com/slugify/-/slugify-1.3.6.tgz"; - sha1 = "ba5fd6159b570fe4811d02ea9b1f4906677638c3"; + name = "sliced___sliced_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/sliced/-/sliced-1.0.1.tgz"; + sha1 = "0b3a662b5d04c3177b1926bea82b03f837a2ef41"; }; } { @@ -10010,11 +10946,11 @@ }; } { - name = "snapsvg___snapsvg_0.4.0.tgz"; + name = "snapsvg___snapsvg_0.5.1.tgz"; path = fetchurl { - name = "snapsvg___snapsvg_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/snapsvg/-/snapsvg-0.4.0.tgz"; - sha1 = "e0767014167825957de7e125c29b0fa89796ea03"; + name = "snapsvg___snapsvg_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/snapsvg/-/snapsvg-0.5.1.tgz"; + sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3"; }; } { @@ -10026,27 +10962,43 @@ }; } { - name = "socket.io_client___socket.io_client_2.1.1.tgz"; + name = "socket.io_client___socket.io_client_2.3.0.tgz"; path = fetchurl { - name = "socket.io_client___socket.io_client_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz"; - sha1 = "dcb38103436ab4578ddb026638ae2f21b623671f"; + name = "socket.io_client___socket.io_client_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.0.tgz"; + sha1 = "14d5ba2e00b9bcd145ae443ab96b3f86cbcc1bb4"; }; } { - name = "socket.io_parser___socket.io_parser_3.2.0.tgz"; + name = "socket.io_client___socket.io_client_2.3.1.tgz"; path = fetchurl { - name = "socket.io_parser___socket.io_parser_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz"; - sha1 = "e7c6228b6aa1f814e6148aea325b51aa9499e077"; + name = "socket.io_client___socket.io_client_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.3.1.tgz"; + sha1 = "91a4038ef4d03c19967bb3c646fec6e0eaa78cff"; }; } { - name = "socket.io___socket.io_2.1.1.tgz"; + name = "socket.io_parser___socket.io_parser_3.3.1.tgz"; path = fetchurl { - name = "socket.io___socket.io_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz"; - sha1 = "a069c5feabee3e6b214a75b40ce0652e1cfb9980"; + name = "socket.io_parser___socket.io_parser_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.1.tgz"; + sha1 = "f07d9c8cb3fb92633aa93e76d98fd3a334623199"; + }; + } + { + name = "socket.io_parser___socket.io_parser_3.4.1.tgz"; + path = fetchurl { + name = "socket.io_parser___socket.io_parser_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz"; + sha1 = "b06af838302975837eab2dc980037da24054d64a"; + }; + } + { + name = "socket.io___socket.io_2.3.0.tgz"; + path = fetchurl { + name = "socket.io___socket.io_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/socket.io/-/socket.io-2.3.0.tgz"; + sha1 = "cd762ed6a4faeca59bc1f3e243c0969311eb73fb"; }; } { @@ -10082,11 +11034,11 @@ }; } { - name = "source_map_support___source_map_support_0.5.16.tgz"; + name = "source_map_support___source_map_support_0.5.19.tgz"; path = fetchurl { - name = "source_map_support___source_map_support_0.5.16.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz"; - sha1 = "0ae069e7fe3ba7538c64c98515e35339eac5a042"; + name = "source_map_support___source_map_support_0.5.19.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; + sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; }; } { @@ -10114,43 +11066,43 @@ }; } { - name = "sourcemap_codec___sourcemap_codec_1.4.8.tgz"; + name = "source_map___source_map_0.7.3.tgz"; path = fetchurl { - name = "sourcemap_codec___sourcemap_codec_1.4.8.tgz"; - url = "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"; - sha1 = "ea804bd94857402e6992d05a38ef1ae35a9ab4c4"; + name = "source_map___source_map_0.7.3.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; + sha1 = "5302f8169031735226544092e64981f751750383"; }; } { - name = "spdx_correct___spdx_correct_3.1.0.tgz"; + name = "spdx_correct___spdx_correct_3.1.1.tgz"; path = fetchurl { - name = "spdx_correct___spdx_correct_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz"; - sha1 = "fb83e504445268f154b074e218c87c003cd31df4"; + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha1 = "dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"; }; } { - name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; path = fetchurl { - name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; - sha1 = "2ea450aee74f2a89bfb94519c07fcd6f41322977"; + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; }; } { - name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; path = fetchurl { - name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; - sha1 = "99e119b7a5da00e05491c9fa338b7904823b41d0"; + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; }; } { - name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; + name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha1 = "3694b5804567a458d3c8045842a6358632f62654"; + name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; + sha1 = "c80757383c28abf7296744998cbc106ae8b854ce"; }; } { @@ -10170,11 +11122,11 @@ }; } { - name = "split___split_1.0.1.tgz"; + name = "split2___split2_3.2.2.tgz"; path = fetchurl { - name = "split___split_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz"; - sha1 = "605bd9be303aa59fb35f9229fbea0ddec9ea07d9"; + name = "split2___split2_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz"; + sha1 = "bf2cf2a37d838312c249c89206fd7a17dd12365f"; }; } { @@ -10194,19 +11146,19 @@ }; } { - name = "sqlite3___sqlite3_4.1.1.tgz"; + name = "sqlite3___sqlite3_4.2.0.tgz"; path = fetchurl { - name = "sqlite3___sqlite3_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.1.1.tgz"; - sha1 = "539a42e476640796578e22d589b3283c28055242"; + name = "sqlite3___sqlite3_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.2.0.tgz"; + sha1 = "49026d665e9fc4f922e56fb9711ba5b4c85c4901"; }; } { - name = "sqlstring___sqlstring_2.3.1.tgz"; + name = "sqlstring___sqlstring_2.3.2.tgz"; path = fetchurl { - name = "sqlstring___sqlstring_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.1.tgz"; - sha1 = "475393ff9e91479aea62dcaf0ca3d14983a7fb40"; + name = "sqlstring___sqlstring_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.2.tgz"; + sha1 = "cdae7169389a1375b18e885f2e60b3e460809514"; }; } { @@ -10226,6 +11178,14 @@ }; } { + name = "ssri___ssri_8.0.0.tgz"; + path = fetchurl { + name = "ssri___ssri_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz"; + sha1 = "79ca74e21f8ceaeddfcb4b90143c458b8d988808"; + }; + } + { name = "stable___stable_0.1.8.tgz"; path = fetchurl { name = "stable___stable_0.1.8.tgz"; @@ -10242,6 +11202,14 @@ }; } { + name = "state_toggle___state_toggle_1.0.3.tgz"; + path = fetchurl { + name = "state_toggle___state_toggle_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz"; + sha1 = "e123b16a88e143139b09c6852221bc9815917dfe"; + }; + } + { name = "static_extend___static_extend_0.1.2.tgz"; path = fetchurl { name = "static_extend___static_extend_0.1.2.tgz"; @@ -10290,14 +11258,6 @@ }; } { - name = "stream_from_to___stream_from_to_1.4.3.tgz"; - path = fetchurl { - name = "stream_from_to___stream_from_to_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/stream-from-to/-/stream-from-to-1.4.3.tgz"; - sha1 = "b270473ebc514e73615727c5d2f76b229941df94"; - }; - } - { name = "stream_http___stream_http_2.8.3.tgz"; path = fetchurl { name = "stream_http___stream_http_2.8.3.tgz"; @@ -10362,19 +11322,27 @@ }; } { - name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz"; + name = "string_width___string_width_4.2.0.tgz"; path = fetchurl { - name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; - sha1 = "9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"; + name = "string_width___string_width_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; + sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; }; } { - name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz"; + name = "string.prototype.trimend___string.prototype.trimend_1.0.2.tgz"; path = fetchurl { - name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; - sha1 = "440314b15996c866ce8a0341894d45186200c5d9"; + name = "string.prototype.trimend___string.prototype.trimend_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz"; + sha1 = "6ddd9a8796bc714b489a3ae22246a208f37bfa46"; + }; + } + { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.2.tgz"; + path = fetchurl { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz"; + sha1 = "22d45da81015309cd0cdd79787e8919fc5c613e7"; }; } { @@ -10410,6 +11378,14 @@ }; } { + name = "stringify_entities___stringify_entities_3.1.0.tgz"; + path = fetchurl { + name = "stringify_entities___stringify_entities_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-3.1.0.tgz"; + sha1 = "b8d3feac256d9ffcc9fa1fefdcf3ca70576ee903"; + }; + } + { name = "strip_ansi___strip_ansi_3.0.1.tgz"; path = fetchurl { name = "strip_ansi___strip_ansi_3.0.1.tgz"; @@ -10434,6 +11410,14 @@ }; } { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + }; + } + { name = "strip_ansi___strip_ansi_0.1.1.tgz"; path = fetchurl { name = "strip_ansi___strip_ansi_0.1.1.tgz"; @@ -10450,22 +11434,6 @@ }; } { - name = "strip_css_comments___strip_css_comments_3.0.0.tgz"; - path = fetchurl { - name = "strip_css_comments___strip_css_comments_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-css-comments/-/strip-css-comments-3.0.0.tgz"; - sha1 = "7a5625eff8a2b226cf8947a11254da96e13dae89"; - }; - } - { - name = "strip_eof___strip_eof_1.0.0.tgz"; - path = fetchurl { - name = "strip_eof___strip_eof_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz"; - sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; - }; - } - { name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; path = fetchurl { name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; @@ -10474,11 +11442,11 @@ }; } { - name = "style_loader___style_loader_1.1.3.tgz"; + name = "strtok3___strtok3_6.0.4.tgz"; path = fetchurl { - name = "style_loader___style_loader_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.3.tgz"; - sha1 = "9e826e69c683c4d9bf9db924f85e9abb30d5e200"; + name = "strtok3___strtok3_6.0.4.tgz"; + url = "https://registry.yarnpkg.com/strtok3/-/strtok3-6.0.4.tgz"; + sha1 = "ede0d20fde5aa9fda56417c3558eaafccc724694"; }; } { @@ -10490,6 +11458,14 @@ }; } { + name = "stylis___stylis_3.5.4.tgz"; + path = fetchurl { + name = "stylis___stylis_3.5.4.tgz"; + url = "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz"; + sha1 = "f665f25f5e299cf3d64654ab949a57c768b73fbe"; + }; + } + { name = "superagent___superagent_1.8.3.tgz"; path = fetchurl { name = "superagent___superagent_1.8.3.tgz"; @@ -10506,14 +11482,6 @@ }; } { - name = "supports_color___supports_color_6.1.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; - sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3"; - }; - } - { name = "supports_color___supports_color_2.0.0.tgz"; path = fetchurl { name = "supports_color___supports_color_2.0.0.tgz"; @@ -10530,6 +11498,22 @@ }; } { + name = "supports_color___supports_color_6.1.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; + sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3"; + }; + } + { + name = "supports_color___supports_color_7.2.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + }; + } + { name = "svgo___svgo_1.3.2.tgz"; path = fetchurl { name = "svgo___svgo_1.3.2.tgz"; @@ -10562,11 +11546,11 @@ }; } { - name = "tar_stream___tar_stream_1.6.2.tgz"; + name = "tar_stream___tar_stream_2.1.4.tgz"; path = fetchurl { - name = "tar_stream___tar_stream_1.6.2.tgz"; - url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz"; - sha1 = "8ea55dab37972253d9a9af90fdcd559ae435c555"; + name = "tar_stream___tar_stream_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz"; + sha1 = "c4fb1a11eb0da29b893a5b25476397ba2d053bfa"; }; } { @@ -10578,6 +11562,14 @@ }; } { + name = "tar___tar_6.0.5.tgz"; + path = fetchurl { + name = "tar___tar_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz"; + sha1 = "bde815086e10b39f1dcd298e89d596e1535e200f"; + }; + } + { name = "tedious___tedious_6.7.0.tgz"; path = fetchurl { name = "tedious___tedious_6.7.0.tgz"; @@ -10586,19 +11578,19 @@ }; } { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz"; path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz"; - sha1 = "5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"; + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz"; + sha1 = "a217aefaea330e734ffacb6120ec1fa312d6040b"; }; } { - name = "terser___terser_4.6.3.tgz"; + name = "terser___terser_4.8.0.tgz"; path = fetchurl { - name = "terser___terser_4.6.3.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz"; - sha1 = "e33aa42461ced5238d352d2df2a67f21921f8d87"; + name = "terser___terser_4.8.0.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz"; + sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17"; }; } { @@ -10618,14 +11610,6 @@ }; } { - name = "throttleit___throttleit_1.0.0.tgz"; - path = fetchurl { - name = "throttleit___throttleit_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz"; - sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; - }; - } - { name = "through2___through2_0.6.5.tgz"; path = fetchurl { name = "through2___through2_0.6.5.tgz"; @@ -10642,14 +11626,6 @@ }; } { - name = "through2___through2_3.0.1.tgz"; - path = fetchurl { - name = "through2___through2_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz"; - sha1 = "39276e713c3302edf9e388dd9c812dd3b825bd5a"; - }; - } - { name = "through___through_2.3.8.tgz"; path = fetchurl { name = "through___through_2.3.8.tgz"; @@ -10658,11 +11634,11 @@ }; } { - name = "timers_browserify___timers_browserify_2.0.11.tgz"; + name = "timers_browserify___timers_browserify_2.0.12.tgz"; path = fetchurl { - name = "timers_browserify___timers_browserify_2.0.11.tgz"; - url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz"; - sha1 = "800b1f3eee272e5bc53ee465a04d0e804c31211f"; + name = "timers_browserify___timers_browserify_2.0.12.tgz"; + url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz"; + sha1 = "44a45c11fbf407f34f97bccd1577c652361b00ee"; }; } { @@ -10698,14 +11674,6 @@ }; } { - name = "tmp___tmp_0.1.0.tgz"; - path = fetchurl { - name = "tmp___tmp_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz"; - sha1 = "ee434a4e22543082e294ba6201dcc6eafefa2877"; - }; - } - { name = "to_array___to_array_0.1.4.tgz"; path = fetchurl { name = "to_array___to_array_0.1.4.tgz"; @@ -10722,14 +11690,6 @@ }; } { - name = "to_buffer___to_buffer_1.1.1.tgz"; - path = fetchurl { - name = "to_buffer___to_buffer_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz"; - sha1 = "493bd48f62d7c43fcded313a03dcadb2e1213a80"; - }; - } - { name = "to_fast_properties___to_fast_properties_1.0.3.tgz"; path = fetchurl { name = "to_fast_properties___to_fast_properties_1.0.3.tgz"; @@ -10754,6 +11714,14 @@ }; } { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + }; + } + { name = "to_regex___to_regex_3.0.2.tgz"; path = fetchurl { name = "to_regex___to_regex_3.0.2.tgz"; @@ -10762,6 +11730,14 @@ }; } { + name = "to_vfile___to_vfile_6.1.0.tgz"; + path = fetchurl { + name = "to_vfile___to_vfile_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/to-vfile/-/to-vfile-6.1.0.tgz"; + sha1 = "5f7a3f65813c2c4e34ee1f7643a5646344627699"; + }; + } + { name = "toidentifier___toidentifier_1.0.0.tgz"; path = fetchurl { name = "toidentifier___toidentifier_1.0.0.tgz"; @@ -10770,6 +11746,14 @@ }; } { + name = "token_types___token_types_2.0.0.tgz"; + path = fetchurl { + name = "token_types___token_types_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/token-types/-/token-types-2.0.0.tgz"; + sha1 = "b23618af744818299c6fbf125e0fdad98bab7e85"; + }; + } + { name = "toobusy_js___toobusy_js_0.5.1.tgz"; path = fetchurl { name = "toobusy_js___toobusy_js_0.5.1.tgz"; @@ -10786,11 +11770,11 @@ }; } { - name = "tough_cookie___tough_cookie_2.4.3.tgz"; + name = "tough_cookie___tough_cookie_2.5.0.tgz"; path = fetchurl { - name = "tough_cookie___tough_cookie_2.4.3.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz"; - sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781"; + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; }; } { @@ -10810,6 +11794,22 @@ }; } { + name = "trim_trailing_lines___trim_trailing_lines_1.1.4.tgz"; + path = fetchurl { + name = "trim_trailing_lines___trim_trailing_lines_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz"; + sha1 = "bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0"; + }; + } + { + name = "trim___trim_0.0.1.tgz"; + path = fetchurl { + name = "trim___trim_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz"; + sha1 = "5858547f6b290757ee95cccc666fb50084c460dd"; + }; + } + { name = "triple_beam___triple_beam_1.3.0.tgz"; path = fetchurl { name = "triple_beam___triple_beam_1.3.0.tgz"; @@ -10818,6 +11818,14 @@ }; } { + name = "trough___trough_1.0.5.tgz"; + path = fetchurl { + name = "trough___trough_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz"; + sha1 = "b8b639cefad7d0bb2abd37d433ff8293efa5f406"; + }; + } + { name = "try_catch___try_catch_2.0.1.tgz"; path = fetchurl { name = "try_catch___try_catch_2.0.1.tgz"; @@ -10834,11 +11842,19 @@ }; } { - name = "tslib___tslib_1.10.0.tgz"; + name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; path = fetchurl { - name = "tslib___tslib_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz"; - sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a"; + name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; + url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; + sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b"; + }; + } + { + name = "tslib___tslib_1.14.1.tgz"; + path = fetchurl { + name = "tslib___tslib_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; + sha1 = "cf2d38bdc34a134bcaf1091c41f6619e2f672d00"; }; } { @@ -10890,14 +11906,6 @@ }; } { - name = "type_fest___type_fest_0.8.1.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.8.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; - sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; - }; - } - { name = "type_is___type_is_1.6.18.tgz"; path = fetchurl { name = "type_is___type_is_1.6.18.tgz"; @@ -10914,11 +11922,19 @@ }; } { - name = "type___type_2.0.0.tgz"; + name = "type___type_2.1.0.tgz"; path = fetchurl { - name = "type___type_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz"; - sha1 = "5f16ff6ef2eb44f260494dae271033b29c09a9c3"; + name = "type___type_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz"; + sha1 = "9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"; + }; + } + { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + path = fetchurl { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha1 = "a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"; }; } { @@ -10938,27 +11954,19 @@ }; } { - name = "uglify_js___uglify_js_2.8.29.tgz"; + name = "uglify_js___uglify_js_3.11.6.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_2.8.29.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz"; - sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; + name = "uglify_js___uglify_js_3.11.6.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.11.6.tgz"; + sha1 = "144b50d3e05eadd3ad4dd047c60ca541a8cd4e9c"; }; } { - name = "uglify_js___uglify_js_3.7.7.tgz"; + name = "uglify_js___uglify_js_3.12.2.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.7.7.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.7.tgz"; - sha1 = "21e52c7dccda80a53bf7cde69628a7e511aec9c9"; - }; - } - { - name = "uglify_to_browserify___uglify_to_browserify_1.0.2.tgz"; - path = fetchurl { - name = "uglify_to_browserify___uglify_to_browserify_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; - sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + name = "uglify_js___uglify_js_3.12.2.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.2.tgz"; + sha1 = "c7ae89da0ed1bb58999c7fce07190b347fdbdaba"; }; } { @@ -10978,19 +11986,27 @@ }; } { - name = "ultron___ultron_1.1.1.tgz"; + name = "umzug___umzug_2.3.0.tgz"; + path = fetchurl { + name = "umzug___umzug_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/umzug/-/umzug-2.3.0.tgz"; + sha1 = "0ef42b62df54e216b05dcaf627830a6a8b84a184"; + }; + } + { + name = "underscore___underscore_1.11.0.tgz"; path = fetchurl { - name = "ultron___ultron_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz"; - sha1 = "9fe1536a10a664a65266a1e3ccf85fd36302bc9c"; + name = "underscore___underscore_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/underscore/-/underscore-1.11.0.tgz"; + sha1 = "dd7c23a195db34267186044649870ff1bab5929e"; }; } { - name = "umzug___umzug_2.2.0.tgz"; + name = "underscore___underscore_1.6.0.tgz"; path = fetchurl { - name = "umzug___umzug_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/umzug/-/umzug-2.2.0.tgz"; - sha1 = "6160bdc1817e4a63a625946775063c638623e62e"; + name = "underscore___underscore_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz"; + sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; }; } { @@ -11002,51 +12018,51 @@ }; } { - name = "underscore___underscore_1.9.2.tgz"; + name = "unherit___unherit_1.1.3.tgz"; path = fetchurl { - name = "underscore___underscore_1.9.2.tgz"; - url = "https://registry.yarnpkg.com/underscore/-/underscore-1.9.2.tgz"; - sha1 = "0c8d6f536d6f378a5af264a72f7bec50feb7cf2f"; + name = "unherit___unherit_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz"; + sha1 = "6c9b503f2b41b262330c80e91c8614abdaa69c22"; }; } { - name = "underscore___underscore_1.6.0.tgz"; + name = "unified_args___unified_args_8.1.0.tgz"; path = fetchurl { - name = "underscore___underscore_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz"; - sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; + name = "unified_args___unified_args_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/unified-args/-/unified-args-8.1.0.tgz"; + sha1 = "a27dbe996a49fbbf3d9f5c6a98008ab9b0ee6ae5"; }; } { - name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; + name = "unified_engine___unified_engine_8.0.0.tgz"; path = fetchurl { - name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; - sha1 = "2619800c4c825800efdd8343af7dd9933cbe2818"; + name = "unified_engine___unified_engine_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/unified-engine/-/unified-engine-8.0.0.tgz"; + sha1 = "e3996ff6eaecc6ca3408af92b70e25691192d17d"; }; } { - name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; + name = "unified_lint_rule___unified_lint_rule_1.0.6.tgz"; path = fetchurl { - name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; - sha1 = "8ed2a32569961bce9227d09cd3ffbb8fed5f020c"; + name = "unified_lint_rule___unified_lint_rule_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/unified-lint-rule/-/unified-lint-rule-1.0.6.tgz"; + sha1 = "b4ab801ff93c251faa917a8d1c10241af030de84"; }; } { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; + name = "unified_message_control___unified_message_control_3.0.1.tgz"; path = fetchurl { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz"; - sha1 = "5b4b426e08d13a80365e0d657ac7a6c1ec46a277"; + name = "unified_message_control___unified_message_control_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/unified-message-control/-/unified-message-control-3.0.1.tgz"; + sha1 = "7018855daea9af96082cbea35970d48c9c4dbbf2"; }; } { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; + name = "unified___unified_9.2.0.tgz"; path = fetchurl { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz"; - sha1 = "a9cc6cc7ce63a0a3023fc99e341b94431d405a57"; + name = "unified___unified_9.2.0.tgz"; + url = "https://registry.yarnpkg.com/unified/-/unified-9.2.0.tgz"; + sha1 = "67a62c627c40589edebbf60f53edfd4d822027f8"; }; } { @@ -11090,6 +12106,70 @@ }; } { + name = "unist_util_generated___unist_util_generated_1.1.6.tgz"; + path = fetchurl { + name = "unist_util_generated___unist_util_generated_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.6.tgz"; + sha1 = "5ab51f689e2992a472beb1b35f2ce7ff2f324d4b"; + }; + } + { + name = "unist_util_inspect___unist_util_inspect_5.0.1.tgz"; + path = fetchurl { + name = "unist_util_inspect___unist_util_inspect_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/unist-util-inspect/-/unist-util-inspect-5.0.1.tgz"; + sha1 = "168c8770a99902318ca268f8c391e294bcf44540"; + }; + } + { + name = "unist_util_is___unist_util_is_4.0.3.tgz"; + path = fetchurl { + name = "unist_util_is___unist_util_is_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.3.tgz"; + sha1 = "e8b44db55fc20c43752b3346c116344d45d7c91d"; + }; + } + { + name = "unist_util_position___unist_util_position_3.1.0.tgz"; + path = fetchurl { + name = "unist_util_position___unist_util_position_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.1.0.tgz"; + sha1 = "1c42ee6301f8d52f47d14f62bbdb796571fa2d47"; + }; + } + { + name = "unist_util_remove_position___unist_util_remove_position_2.0.1.tgz"; + path = fetchurl { + name = "unist_util_remove_position___unist_util_remove_position_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz"; + sha1 = "5d19ca79fdba712301999b2b73553ca8f3b352cc"; + }; + } + { + name = "unist_util_stringify_position___unist_util_stringify_position_2.0.3.tgz"; + path = fetchurl { + name = "unist_util_stringify_position___unist_util_stringify_position_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz"; + sha1 = "cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"; + }; + } + { + name = "unist_util_visit_parents___unist_util_visit_parents_3.1.1.tgz"; + path = fetchurl { + name = "unist_util_visit_parents___unist_util_visit_parents_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz"; + sha1 = "65a6ce698f78a6b0f56aa0e88f13801886cdaef6"; + }; + } + { + name = "unist_util_visit___unist_util_visit_2.0.3.tgz"; + path = fetchurl { + name = "unist_util_visit___unist_util_visit_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz"; + sha1 = "c3703893146df47203bb8a9795af47d7b971208c"; + }; + } + { name = "universalify___universalify_0.1.2.tgz"; path = fetchurl { name = "universalify___universalify_0.1.2.tgz"; @@ -11138,11 +12218,11 @@ }; } { - name = "uri_js___uri_js_4.2.2.tgz"; + name = "uri_js___uri_js_4.4.0.tgz"; path = fetchurl { - name = "uri_js___uri_js_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz"; - sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0"; + name = "uri_js___uri_js_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz"; + sha1 = "aa714261de793e8a82347a7bcc9ce74e86f28602"; }; } { @@ -11194,11 +12274,11 @@ }; } { - name = "utf_8_validate___utf_8_validate_5.0.2.tgz"; + name = "utf_8_validate___utf_8_validate_5.0.3.tgz"; path = fetchurl { - name = "utf_8_validate___utf_8_validate_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.2.tgz"; - sha1 = "63cfbccd85dc1f2b66cf7a1d0eebc08ed056bfb3"; + name = "utf_8_validate___utf_8_validate_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.3.tgz"; + sha1 = "3b64e418ad2ff829809025fdfef595eab2f03a27"; }; } { @@ -11274,11 +12354,11 @@ }; } { - name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz"; + name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz"; - sha1 = "00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"; + name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; + sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"; }; } { @@ -11362,6 +12442,54 @@ }; } { + name = "vfile_location___vfile_location_3.2.0.tgz"; + path = fetchurl { + name = "vfile_location___vfile_location_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.2.0.tgz"; + sha1 = "d8e41fbcbd406063669ebf6c33d56ae8721d0f3c"; + }; + } + { + name = "vfile_message___vfile_message_2.0.4.tgz"; + path = fetchurl { + name = "vfile_message___vfile_message_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz"; + sha1 = "5b43b88171d409eae58477d13f23dd41d52c371a"; + }; + } + { + name = "vfile_reporter___vfile_reporter_6.0.1.tgz"; + path = fetchurl { + name = "vfile_reporter___vfile_reporter_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.1.tgz"; + sha1 = "45d4dc11df2e312196ea2ceb95e42a67fc8ce814"; + }; + } + { + name = "vfile_sort___vfile_sort_2.2.2.tgz"; + path = fetchurl { + name = "vfile_sort___vfile_sort_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.2.2.tgz"; + sha1 = "720fe067ce156aba0b411a01bb0dc65596aa1190"; + }; + } + { + name = "vfile_statistics___vfile_statistics_1.1.4.tgz"; + path = fetchurl { + name = "vfile_statistics___vfile_statistics_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.4.tgz"; + sha1 = "b99fd15ecf0f44ba088cc973425d666cb7a9f245"; + }; + } + { + name = "vfile___vfile_4.2.0.tgz"; + path = fetchurl { + name = "vfile___vfile_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/vfile/-/vfile-4.2.0.tgz"; + sha1 = "26c78ac92eb70816b01d4565e003b7e65a2a0e01"; + }; + } + { name = "visibilityjs___visibilityjs_1.2.8.tgz"; path = fetchurl { name = "visibilityjs___visibilityjs_1.2.8.tgz"; @@ -11386,19 +12514,27 @@ }; } { - name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz"; + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; path = fetchurl { - name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz"; - sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045"; + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; + sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd"; }; } { - name = "watchpack___watchpack_1.6.0.tgz"; + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.1.tgz"; path = fetchurl { - name = "watchpack___watchpack_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz"; - sha1 = "4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"; + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz"; + sha1 = "38500072ee6ece66f3769936950ea1771be1c957"; + }; + } + { + name = "watchpack___watchpack_1.7.5.tgz"; + path = fetchurl { + name = "watchpack___watchpack_1.7.5.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz"; + sha1 = "1267e6c55e0b9b5be44c2023aed5437a2c26c453"; }; } { @@ -11426,19 +12562,11 @@ }; } { - name = "webpack_cli___webpack_cli_3.3.11.tgz"; - path = fetchurl { - name = "webpack_cli___webpack_cli_3.3.11.tgz"; - url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.11.tgz"; - sha1 = "3bf21889bf597b5d82c38f215135a411edfdc631"; - }; - } - { - name = "webpack_log___webpack_log_2.0.0.tgz"; + name = "webpack_cli___webpack_cli_3.3.12.tgz"; path = fetchurl { - name = "webpack_log___webpack_log_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz"; - sha1 = "5b7928e0637593f119d32f6227c1e0ac31e1b47f"; + name = "webpack_cli___webpack_cli_3.3.12.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz"; + sha1 = "94e9ada081453cd0aa609c99e500012fd3ad2d4a"; }; } { @@ -11458,11 +12586,11 @@ }; } { - name = "webpack___webpack_4.41.6.tgz"; + name = "webpack___webpack_4.44.2.tgz"; path = fetchurl { - name = "webpack___webpack_4.41.6.tgz"; - url = "https://registry.yarnpkg.com/webpack/-/webpack-4.41.6.tgz"; - sha1 = "12f2f804bf6542ef166755050d4afbc8f66ba7e1"; + name = "webpack___webpack_4.44.2.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz"; + sha1 = "6bfe2b0af055c8b2d1e90ed2cd9363f841266b72"; }; } { @@ -11522,27 +12650,19 @@ }; } { - name = "window_size___window_size_0.1.0.tgz"; - path = fetchurl { - name = "window_size___window_size_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz"; - sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; - }; - } - { - name = "winston_transport___winston_transport_4.3.0.tgz"; + name = "winston_transport___winston_transport_4.4.0.tgz"; path = fetchurl { - name = "winston_transport___winston_transport_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.3.0.tgz"; - sha1 = "df68c0c202482c448d9b47313c07304c2d7c2c66"; + name = "winston_transport___winston_transport_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz"; + sha1 = "17af518daa690d5b2ecccaa7acf7b20ca7925e59"; }; } { - name = "winston___winston_3.2.1.tgz"; + name = "winston___winston_3.3.3.tgz"; path = fetchurl { - name = "winston___winston_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/winston/-/winston-3.2.1.tgz"; - sha1 = "63061377976c73584028be2490a1846055f77f07"; + name = "winston___winston_3.3.3.tgz"; + url = "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz"; + sha1 = "ae6172042cafb29786afa3d09c8ff833ab7c9170"; }; } { @@ -11562,19 +12682,11 @@ }; } { - name = "wordwrap___wordwrap_0.0.2.tgz"; + name = "wordwrap___wordwrap_1.0.0.tgz"; path = fetchurl { - name = "wordwrap___wordwrap_0.0.2.tgz"; - url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }; - } - { - name = "wordwrap___wordwrap_0.0.3.tgz"; - path = fetchurl { - name = "wordwrap___wordwrap_0.0.3.tgz"; - url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + name = "wordwrap___wordwrap_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; }; } { @@ -11594,6 +12706,14 @@ }; } { + name = "wrapped___wrapped_1.0.1.tgz"; + path = fetchurl { + name = "wrapped___wrapped_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/wrapped/-/wrapped-1.0.1.tgz"; + sha1 = "c783d9d807b273e9b01e851680a938c87c907242"; + }; + } + { name = "wrappy___wrappy_1.0.2.tgz"; path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; @@ -11626,11 +12746,19 @@ }; } { - name = "ws___ws_3.3.3.tgz"; + name = "ws___ws_7.4.0.tgz"; + path = fetchurl { + name = "ws___ws_7.4.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz"; + sha1 = "a5dd76a24197940d4a8bb9e0e152bb4503764da7"; + }; + } + { + name = "ws___ws_6.1.4.tgz"; path = fetchurl { - name = "ws___ws_3.3.3.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz"; - sha1 = "f1cf84fe2d5e901ebce94efaece785f187a228f2"; + name = "ws___ws_6.1.4.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz"; + sha1 = "5b5c8800afab925e94ccb29d153c8d02c1776ef9"; }; } { @@ -11650,19 +12778,19 @@ }; } { - name = "xml_crypto___xml_crypto_1.4.0.tgz"; + name = "xml_crypto___xml_crypto_2.0.0.tgz"; path = fetchurl { - name = "xml_crypto___xml_crypto_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-1.4.0.tgz"; - sha1 = "de1cec8cd31cbd689cd90d3d6e8a27d4ae807de7"; + name = "xml_crypto___xml_crypto_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.0.0.tgz"; + sha1 = "54cd268ad9d31930afcf7092cbb664258ca9e826"; }; } { - name = "xml_encryption___xml_encryption_1.0.0.tgz"; + name = "xml_encryption___xml_encryption_1.2.1.tgz"; path = fetchurl { - name = "xml_encryption___xml_encryption_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.0.0.tgz"; - sha1 = "fe50d3bbbe2ae06876d6aa95aa3bf958284e1612"; + name = "xml_encryption___xml_encryption_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.2.1.tgz"; + sha1 = "e6d18817c4309fd07ca7793cca93c3fd06745baa"; }; } { @@ -11738,11 +12866,11 @@ }; } { - name = "xmldom___xmldom_0.2.1.tgz"; + name = "xmldom___xmldom_0.4.0.tgz"; path = fetchurl { - name = "xmldom___xmldom_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.2.1.tgz"; - sha1 = "cac9465066f161e1c3302793ea4dbe59c518274f"; + name = "xmldom___xmldom_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.4.0.tgz"; + sha1 = "8771e482a333af44587e30ce026f0998c23f3830"; }; } { @@ -11778,11 +12906,11 @@ }; } { - name = "xss___xss_1.0.6.tgz"; + name = "xss___xss_1.0.8.tgz"; path = fetchurl { - name = "xss___xss_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/xss/-/xss-1.0.6.tgz"; - sha1 = "eaf11e9fc476e3ae289944a1009efddd8a124b51"; + name = "xss___xss_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/xss/-/xss-1.0.8.tgz"; + sha1 = "32feb87feb74b3dcd3d404b7a68ababf10700535"; }; } { @@ -11826,43 +12954,27 @@ }; } { - name = "yargs_parser___yargs_parser_13.1.1.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_13.1.1.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz"; - sha1 = "d26058532aa06d365fe091f6a1fc06b2f7e5eca0"; - }; - } - { - name = "yargs___yargs_13.2.4.tgz"; - path = fetchurl { - name = "yargs___yargs_13.2.4.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz"; - sha1 = "0b562b794016eb9651b98bd37acf364aa5d6dc83"; - }; - } - { - name = "yargs___yargs_13.3.0.tgz"; + name = "yallist___yallist_4.0.0.tgz"; path = fetchurl { - name = "yargs___yargs_13.3.0.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz"; - sha1 = "4c657a55e07e5f2cf947f8a366567c04a0dedc83"; + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; }; } { - name = "yargs___yargs_3.10.0.tgz"; + name = "yargs_parser___yargs_parser_13.1.2.tgz"; path = fetchurl { - name = "yargs___yargs_3.10.0.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz"; - sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; }; } { - name = "yauzl___yauzl_2.4.1.tgz"; + name = "yargs___yargs_13.3.2.tgz"; path = fetchurl { - name = "yauzl___yauzl_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz"; - sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; + name = "yargs___yargs_13.3.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; + sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; }; } { @@ -11874,11 +12986,11 @@ }; } { - name = "zip_stream___zip_stream_1.2.0.tgz"; + name = "zip_stream___zip_stream_4.0.4.tgz"; path = fetchurl { - name = "zip_stream___zip_stream_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz"; - sha1 = "a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"; + name = "zip_stream___zip_stream_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.4.tgz"; + sha1 = "3a8f100b73afaa7d1ae9338d910b321dec77ff3a"; }; } ]; diff --git a/pkgs/servers/x11/xorg/dont-create-logdir-during-build.patch b/pkgs/servers/x11/xorg/dont-create-logdir-during-build.patch new file mode 100644 index 0000000000000..3675292f9c990 --- /dev/null +++ b/pkgs/servers/x11/xorg/dont-create-logdir-during-build.patch @@ -0,0 +1,32 @@ +--- + hw/xfree86/Makefile.am | 1 - + hw/xfree86/Makefile.in | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am +index 9aeaea1..dcca3b8 100644 +--- a/hw/xfree86/Makefile.am ++++ b/hw/xfree86/Makefile.am +@@ -100,7 +100,6 @@ EXTRA_DIST = xorgconf.cpp + + # Without logdir, X will post an error on the terminal and will not start + install-data-local: +- $(AM_V_GEN)$(MKDIR_P) $(DESTDIR)$(logdir) + if CYGWIN + $(INSTALL_DATA) libXorg.exe.a $(DESTDIR)$(libdir)/libXorg.exe.a + endif +diff --git a/hw/xfree86/Makefile.in b/hw/xfree86/Makefile.in +index c4fceee..74da8f1 100644 +--- a/hw/xfree86/Makefile.in ++++ b/hw/xfree86/Makefile.in +@@ -1161,7 +1161,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-local \ + + # Without logdir, X will post an error on the terminal and will not start + install-data-local: +- $(AM_V_GEN)$(MKDIR_P) $(DESTDIR)$(logdir) + @CYGWIN_TRUE@ $(INSTALL_DATA) libXorg.exe.a $(DESTDIR)$(libdir)/libXorg.exe.a + + install-exec-hook: +-- +2.25.4 + diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 02dfb7ee1f559..ddf0aacdf07da 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -571,7 +571,7 @@ self: super: attrs = if (abiCompat == null || lib.hasPrefix abiCompat version) then attrs_passed // { - buildInputs = attrs_passed.buildInputs ++ [ libdrm.dev ]; patchPhase = '' + buildInputs = attrs_passed.buildInputs ++ [ libdrm.dev ]; postPatch = '' for i in dri3/*.c do sed -i -e "s|#include <drm_fourcc.h>|#include <libdrm/drm_fourcc.h>|" $i @@ -626,6 +626,12 @@ self: super: if (!isDarwin) then { outputs = [ "out" "dev" ]; + patches = [ + # The build process tries to create the specified logdir when building. + # + # We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail + ./dont-create-logdir-during-build.patch + ]; buildInputs = commonBuildInputs ++ [ libdrm mesa ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ udev @@ -642,6 +648,7 @@ self: super: "--with-xkb-bin-directory=${self.xkbcomp}/bin" "--with-xkb-path=${self.xkeyboardconfig}/share/X11/xkb" "--with-xkb-output=$out/share/X11/xkb/compiled" + "--with-log-dir=/var/log" "--enable-glamor" ] ++ lib.optionals stdenv.hostPlatform.isMusl [ "--disable-tls" @@ -758,8 +765,8 @@ self: super: ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ self.xauth ] ++ lib.optionals isDarwin [ self.libX11 self.xorgproto ]; - prePatch = '' - sed -i 's|^defaultserverargs="|&-logfile \"$HOME/.xorg.log\"|p' startx.cpp + postFixup = '' + substituteInPlace $out/bin/startx --replace $out/etc/X11/xinit/xserverrc /etc/X11/xinit/xserverrc ''; }); diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix index 6bd3ebc4232c2..515282c1dbcf3 100644 --- a/pkgs/servers/xandikos/default.nix +++ b/pkgs/servers/xandikos/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchFromGitHub , python3Packages +, installShellFiles }: python3Packages.buildPythonApplication rec { @@ -24,10 +25,17 @@ python3Packages.buildPythonApplication rec { prometheus_client ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installManPage xandikos.1 + ''; + meta = with stdenv.lib; { description = "Lightweight CalDAV/CardDAV server"; homepage = "https://github.com/jelmer/xandikos"; license = licenses.gpl3Plus; + changelog = "https://github.com/jelmer/xandikos/blob/v${version}/NEWS"; maintainers = with maintainers; [ _0x4A6F ]; }; } diff --git a/pkgs/shells/bash/5.0.nix b/pkgs/shells/bash/5.1.nix index 7120910d79e7f..8950e5f5b1cfa 100644 --- a/pkgs/shells/bash/5.0.nix +++ b/pkgs/shells/bash/5.1.nix @@ -1,9 +1,15 @@ -{ stdenv, buildPackages -, fetchurl, binutils ? null, bison, util-linux - -# patch for cygwin requires readline support -, interactive ? stdenv.isCygwin, readline80 ? null -, withDocs ? false, texinfo ? null +{ stdenv +, buildPackages +, fetchurl +, binutils ? null +, bison +, util-linux + + # patch for cygwin requires readline support +, interactive ? stdenv.isCygwin +, readline80 ? null +, withDocs ? false +, texinfo ? null }: with stdenv.lib; @@ -11,21 +17,19 @@ with stdenv.lib; assert interactive -> readline80 != null; assert withDocs -> texinfo != null; assert stdenv.hostPlatform.isDarwin -> binutils != null; - let - upstreamPatches = import ./bash-5.0-patches.nix (nr: sha256: fetchurl { - url = "mirror://gnu/bash/bash-5.0-patches/bash50-${nr}"; + upstreamPatches = import ./bash-5.1-patches.nix (nr: sha256: fetchurl { + url = "mirror://gnu/bash/bash-5.1-patches/bash51-${nr}"; inherit sha256; }); in - stdenv.mkDerivation rec { name = "bash-${optionalString interactive "interactive-"}${version}-p${toString (builtins.length upstreamPatches)}"; - version = "5.0"; + version = "5.1"; src = fetchurl { url = "mirror://gnu/bash/bash-${version}.tar.gz"; - sha256 = "0kgvfwqdcd90waczf4gx39xnrxzijhjrzyzv7s8v4w31qqm0za5l"; + sha256 = "1alv68wplnfdm6mh39hm57060xgssb9vqca4yr1cyva0c342n0fc"; }; hardeningDisable = [ "format" ]; @@ -44,7 +48,7 @@ stdenv.mkDerivation rec { patchFlags = [ "-p0" "-T" ]; patches = upstreamPatches - ++ [ ./pgrp-pipe-5.0.patch ]; + ++ [ ./pgrp-pipe-5.1.patch ]; configureFlags = [ (if interactive then "--with-installed-readline" else "--disable-readline") @@ -87,7 +91,8 @@ stdenv.mkDerivation rec { rm -f $out/lib/bash/Makefile.inc ''; - postFixup = if interactive + postFixup = + if interactive then '' substituteInPlace "$out/bin/bashbug" \ --replace '${stdenv.shell}' "$out/bin/bash" @@ -101,7 +106,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/bash/"; description = "GNU Bourne-Again Shell, the de facto standard shell on Linux" + - (if interactive then " (for interactive use)" else ""); + (if interactive then " (for interactive use)" else ""); longDescription = '' Bash is the shell, or command language interpreter, that will diff --git a/pkgs/shells/bash/bash-5.0-patches.nix b/pkgs/shells/bash/bash-5.0-patches.nix deleted file mode 100644 index 4315191d19395..0000000000000 --- a/pkgs/shells/bash/bash-5.0-patches.nix +++ /dev/null @@ -1,22 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -(patch "001" "12bjfdy6bg8nhyw27bdgxn7h4paylx8d927skfmi9pxd1wgrxzpj") -(patch "002" "01w7yrzmz10mw06ys0546vhl7isv2v402ziyvfd7k67588spvs47") -(patch "003" "0ny81ridp5n0j69hb8ixrc7dmxybby54jbsz5hikly8kgg1wvssf") -(patch "004" "021gqqvgydixkrmqss64b6srfdlkvnx88lyfzpxfrn5d6bc7li0l") -(patch "005" "0xl2kyzm84nlyklrqzkn73ixabhzfhn9x91lzcmis89cppclvxav") -(patch "006" "0844749ixk1z60437nkznzms1f0nzh9an62kj7sny6r0zyk2k1fn") -(patch "007" "16xg37gp1b8zlj5969w8mcrparwqlcbj9695vn3qhgb7wdz1xd0p") -(patch "008" "1qyp19krjh8zxvb0jgwmyjz40djslwcf4xi7kc1ab0iaca44bipf") -(patch "009" "00yrjjqd95s81b21qq3ba1y7h879q8jaajlkjggc6grhcwbs4g7d") -(patch "010" "04ca5bjv456v538mkspzvn4xb2zdphh31r4fpvfm9p5my0jw7yyn") -(patch "011" "1sklyixvsv8993kxzs0jigacpdchjrq7jv5xpdx7kbqyp4rf6k9c") -(patch "012" "0cz21qg2gbr40lfgza7g02bqi2qknwqgxnq459pjj640d0cywhr9") -(patch "013" "16h9nwz3yzwj7fnxvlidjymdc4yr30h818433gh9j1x3in6igmzm") -(patch "014" "12gm5bvv2pd3m72z2ilj26pa08c61az253dsgfl24vpf2ijywvjx") -(patch "015" "0pm0px758w4i23s55wajcv6lqfiym7zgxvq0pxf6vclkv8nxy5x5") -(patch "016" "0vdha332km2iwx8g2ld15jy7d24cbplzgr1531dpzylr9ajxglgz") -(patch "017" "0cfw5lz3fcvq9h1fxihxvw940fjk68015jazvl8x8rlazgxbkwsc") -(patch "018" "1lw1vv0aj6x254hgx4klbz8qkvwxif0g6i7dx116cnhhb8vlwcbw") -] diff --git a/pkgs/shells/bash/bash-5.1-patches.nix b/pkgs/shells/bash/bash-5.1-patches.nix new file mode 100644 index 0000000000000..b834deda0f807 --- /dev/null +++ b/pkgs/shells/bash/bash-5.1-patches.nix @@ -0,0 +1,8 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +(patch "001" "1ymm8ppss6gyh9ifznjwiabrb4k91npd09c10y7mk66xp8yppc7b") +(patch "002" "1gjx9zqcm407am3n2sh44b8dxm48kgm15rzfiijqxr01m0hn3shm") +(patch "003" "1cdnpbfc64yhvkjj4d12s9ywp11g195vzfl1cab24sq55wkcrwi2") +(patch "004" "11iwhy6v562bv0kk7lwj7f5jj65ma9bblivy0v02h3ggcibbdbls") +] diff --git a/pkgs/shells/bash/pgrp-pipe-5.0.patch b/pkgs/shells/bash/pgrp-pipe-5.1.patch index 2a9fa6f33c3bb..2a9fa6f33c3bb 100644 --- a/pkgs/shells/bash/pgrp-pipe-5.0.patch +++ b/pkgs/shells/bash/pgrp-pipe-5.1.patch diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index f84f150bc5598..c2cc626bd3c93 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "ion"; @@ -20,6 +20,10 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ dywedir ]; }; + buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin [ + Security + ]; + passthru = { shellPath = "/bin/ion"; }; diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 44961696195f7..1774a1c667720 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.23.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0rbg0jchg59x0g4h0xahdm9qah8l8g4i2s8lkaqzdkm4yv29gqx4"; + sha256 = "0nza860gg9lnkld9c7is93fmfxl9yay8yf2f18h16cgjk3n686kd"; }; - cargoSha256 = "1sbgn68n0rqh1m98dm3r2a3pqqqx4v7axw5djw8qlx4gv7xw1ql0"; + cargoSha256 = "1mb6ws2zw089cx475c1vpvvxkzi8by6wmw4frans5lbl3a2lldl0"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 8fbbfd47fb958..9dcb1a9705327 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2020-11-26"; + version = "2020-12-27"; pname = "oh-my-zsh"; - rev = "05e2956dc61198d4767b96d97c5d10c93cedd6e3"; + rev = "90ffda7ed28dd8273b80bd262c6a28be65e4da71"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1Eh6L92hvSHcQeQL+1bCDrg/2FKaZshKTTF2PeVGhLs="; + sha256 = "lYf+NmSgY0WFBMWxVBrh/f2cSJ0WqnaTktQNA0nYZNE="; }; installPhase = '' diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index c8e845eec99e8..7e39e6779d196 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.14.3"; + version = "1.14.4"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "073d9hlf6x1nq63mzpywc1b8cljbm1dd8qr07fdf0hsk2fcjiqg7"; + sha256 = "1072ikklvpvx6qf0q8ydbi1qc1dxjjfs4031b4zzgjw766xnpcbk"; }; patches = [ diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 8746f065b1bf0..f45e981cff07e 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -39,6 +39,7 @@ with pkgs; cross = callPackage ./cross {}; rustCustomSysroot = callPackage ./rust-sysroot {}; + buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { }; nixos-functions = callPackage ./nixos-functions {}; diff --git a/pkgs/tools/X11/xwallpaper/default.nix b/pkgs/tools/X11/xwallpaper/default.nix index 759613553fe00..aab4d1180e0e5 100644 --- a/pkgs/tools/X11/xwallpaper/default.nix +++ b/pkgs/tools/X11/xwallpaper/default.nix @@ -5,6 +5,7 @@ , pixman , xcbutil , xcbutilimage +, libseccomp , libjpeg , libpng , libXpm @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ pixman xcbutilimage xcbutil libjpeg libpng libXpm ]; + buildInputs = [ pixman xcbutilimage xcbutil libseccomp libjpeg libpng libXpm ]; meta = with stdenv.lib; { homepage = "https://github.com/stoeckmann/xwallpaper"; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 42ee345cbaf9f..4f28a6d744b1c 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.18.195"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.203"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "1969rzcqj3k81k0wbvq8fpklx1z9vjh6db7i81mkbqqfkjm9pq2k"; + sha256 = "sha256-afcXbYKRc9w0Zbuyg/bDA/J/lHm4N4FttUgGk4h4H4k="; }; postPatch = '' diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 81389f39dd380..59b22f48f99ec 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.15.1"; + version = "2.16.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "05vwaafb6yzvrhig0gjkb4803yj6qr00gqh41rws9520899f2m9d"; + sha256 = "wuHPNpt5pizgAwxRxJpRBiX6keJpKRpHu6M5BpFUyeY="; }; # put packages that needs to be overriden in the py package scope diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 29787cfb17a14..f5f661c8e9b96 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -6,7 +6,8 @@ let prePatch = (attrs.prePatch or "") + '' rm -f azure_bdist_wheel.py tox.ini substituteInPlace setup.py \ - --replace "wheel==0.30.0" "wheel" + --replace "wheel==0.30.0" "wheel" \ + --replace "cryptography>=2.3.1,<3.0.0" "cryptography" sed -i "/azure-namespace-package/c\ " setup.cfg ''; @@ -148,8 +149,8 @@ let azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip" "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.2.0" "zip" - "ddfe4c0c55f0e3fd1f66dd82c1d4a3d872ce124639b9a77fcd172daf464438a5"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "10.3.0" "zip" + "1bb95rlwfikfl3pgyga0v5lfgr1xyaybm1nq2498rncfcvdpkjhz"; azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.6.0" "zip" "0pvc8f3g12q7als0pgy26kqi2i9grykwrjyiv2vijci9wxn22vpy"; @@ -196,8 +197,8 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.13.0" "zip" - "1fq3hgwwhba6vv07rciiibwmp2zlygz20zp1mzdxajqlfg838q78"; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.14.0" "zip" + "0f8m7j8sdm1rfrwizz3qfk4lyb2x02af3v66as5yqjriipk1bnbg"; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; @@ -205,8 +206,8 @@ let azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "0.7.0" "zip" "18n2lqvrhq40gdqhlzzg8mc03571i02c7qq7jv771lc58rqpzysh"; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "12.0.0" "zip" - "150074lnld426lv37v4gy41cqqvj57zw4mrz5svv7iynljb2jl3l"; + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "13.0.0" "zip" + "02ac54fs4wqdwy986j9qyx6fbl5zmpkh1sykr9r6mqk1xx9l4jq8"; azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "2.1.0" "zip" "1py0hch0wghzfxazdrrs7p0kln2zn9jh3fmkzwd2z8qggj38q6gm"; @@ -241,8 +242,8 @@ let azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip" "1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm"; - azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.3.0" "zip" - "0sa12s5af9xl1wnblilswxc6ydr2anm9an000iz3ks54pydby2vy"; + azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "0.5.0" "zip" + "0dr8xml9zlsnag761zx7ifvdkhsv4syzxpmdn4gbf9c5qcq65dsf"; azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "0.1.0" "zip" "1pq5rn32yvrf5kqjafnj0kc92gpfg435w2l0k7cm8gvlja4r4m77"; @@ -256,8 +257,8 @@ let azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "8.0.0" "zip" "2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d"; - azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.0.0" "zip" - "0y1bq6lirwx4n8zydi49jx72xfc7dppzhy82x22sx98id8lxgcwm"; + azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.2.0" "zip" + "10b8y1b5qlyr666x7yimnwis9386ciphrxdnmmyzk90qg6h0niry"; azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc15" "zip" "1fnmdl3m7kdn6c2ws5vrm7nwadcbq9mgc6g5bg4s1a4xjb23q6vb"; @@ -392,19 +393,6 @@ let ''; }); - cryptography = super.cryptography.overridePythonAttrs(oldAttrs: rec { - version = "2.9.2"; - - src = super.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - sha256 = "0af25w5mkd6vwns3r6ai1w5ip9xp0ms9s261zzssbpadzdr05hx0"; - }; - - # prevent cycle with cryptography-vectors - doCheck = false; - }); - knack = super.knack.overridePythonAttrs(oldAttrs: rec { version = "0.7.2"; diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index 7a80ed371884a..c2126181f36ac 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -1,15 +1,23 @@ -{ buildGoModule, lib, fetchFromGitHub }: +{ buildGoModule, lib, fetchFromGitHub, fetchpatch }: + buildGoModule rec { pname = "chamber"; - version = "2.8.2"; + version = "2.9.0"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7L9RaE4LvHRR6MUimze5QpbnfasWJdY4arfS/Usy2q0="; + sha256 = "eOMY9P/fCYvnl6KGNb6wohykLA0Sj9Ti0L18gx5dqUk="; }; + patches = [ + (fetchpatch { + url = "https://github.com/segmentio/chamber/commit/3aeb416cdf4c232552b653262e37047fc13b1f02.patch"; + sha256 = "cyxNF9ZP4oG+1sfX9yWZCyntpAvwYUh5BzTirZQGejc="; + }) + ]; + vendorSha256 = null; # set the version. see: chamber's Makefile diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 565196280ce0a..cbe6e3eed1f3e 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clair"; - version = "2.1.4"; + version = "4.0.0"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - sha256 = "1bvwh3ghxb3ynq8a07ka9i0rzaqg1aikxvqxmpjkwjvhwk63lwqd"; + sha256 = "10kgg2i5yzdfhylrdkmh8rsc4cgdnhcgfa8fa4dm8m3licjciwam"; }; - vendorSha256 = "0x31n50vd8660z816as6kms5dkv87b0mhblccpkvd9cbvcv2n37a"; + vendorSha256 = "1l3b86f5xmyc6lskvb4ab30adcgzb69ayccc0wcz2f28sda3i80r"; doCheck = false; @@ -25,6 +25,7 @@ buildGoModule rec { meta = with lib; { description = "Vulnerability Static Analysis for Containers"; homepage = "https://github.com/quay/clair"; + changelog = "https://github.com/quay/clair/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ marsam ]; }; diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix new file mode 100644 index 0000000000000..f3cc5141618b9 --- /dev/null +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -0,0 +1,44 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "credhub-cli"; + version = "2.9.0"; + + src = fetchFromGitHub { + owner = "cloudfoundry-incubator"; + repo = "credhub-cli"; + rev = version; + sha256 = "1j0i0b79ph2i52cj0qln8wvp6gwhl73akkn026h27vvmlw9sndc2"; + }; + + # these tests require network access that we're not going to give them + postPatch = '' + rm commands/api_test.go + rm commands/socks5_test.go + ''; + __darwinAllowLocalNetworking = true; + + vendorSha256 = null; + + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X code.cloudfoundry.org/credhub-cli/version.Version=${version}" + ]; + + postInstall = '' + ln -s $out/bin/credhub-cli $out/bin/credhub + ''; + + preCheck = '' + export HOME=$TMPDIR + ''; + + meta = with stdenv.lib; { + description = "Provides a command line interface to interact with CredHub servers"; + homepage = "https://github.com/cloudfoundry-incubator/credhub-cli"; + maintainers = with maintainers; [ ris ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 4e87a68866cef..6c105cf9b335b 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -31,14 +31,14 @@ in buildPythonApplication rec { pname = "lexicon"; - version = "3.4.3"; + version = "3.5.2"; format = "pyproject"; src = fetchFromGitHub { owner = "AnalogJ"; repo = pname; rev = "v${version}"; - sha256 = "1ym4gj4xyd69rsc5niilvcb72gys22rjxhj4qd574vyx3ryl34za"; + sha256 = "1jsc2ybbf3mbvgzkgliria494dpj23mgqnw2lh43cnd9rgsjvzn3"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/audio/aucdtect/default.nix b/pkgs/tools/audio/aucdtect/default.nix deleted file mode 100644 index ad9d5fb869053..0000000000000 --- a/pkgs/tools/audio/aucdtect/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, lib, rpmextract }: - -with lib; - -stdenv.mkDerivation rec { - pname = "aucdtect"; - version = "0.8-2"; - - src = fetchurl { - url = "http://www.true-audio.com/ftp/${pname}-${version}.i586.rpm"; - sha256 = "1lp5f0rq5b5n5il0c64m00gcfskarvgqslpryms9443d200y6mmd"; - }; - - unpackCmd = "${rpmextract}/bin/rpmextract $src"; - - installPhase = '' - runHook preInstall - - install -Dm755 local/bin/auCDtect $out/bin/aucdtect - - runHook postInstall - ''; - - dontStrip = true; - - meta = with stdenv.lib; { - description = "Verify authenticity of lossless audio files"; - homepage = "http://tausoft.org"; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/tools/audio/volctl/default.nix index 2a55015be1052..1965fb083169a 100644 --- a/pkgs/tools/audio/volctl/default.nix +++ b/pkgs/tools/audio/volctl/default.nix @@ -1,43 +1,49 @@ -{ stdenv, fetchFromGitHub, python3, libpulseaudio, glib, gtk3, gobject-introspection, wrapGAppsHook }: +{ stdenv, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection, libpulseaudio, glib, gtk3, pango, xorg }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "volctl"; - version = "0.6.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "buzz"; repo = pname; - rev = version; - sha256 = "0rppqc5wiqxd83z2mgvhi6gdx7yhy9wnav1dbbi1wvm7lzw6fnil"; + rev = "v${version}"; + sha256 = "02scfscf4mdrphzrd7cbwbhpig9bhvaws8qk4zc81z8vvf3mcfv2"; }; + postPatch = '' + substituteInPlace volctl/lib/xwrappers.py \ + --replace 'libXfixes.so' "${xorg.libXfixes}/lib/libXfixes.so" \ + --replace 'libXfixes.so.3' "${xorg.libXfixes}/lib/libXfixes.so.3" + ''; + + preBuild = '' + export LD_LIBRARY_PATH=${libpulseaudio}/lib + ''; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; - buildInputs = [ - glib - gtk3 - libpulseaudio - ]; - - pythonPath = with python3.pkgs; [ + propagatedBuildInputs = [ pango gtk3 ] ++ (with python3Packages; [ + click + pycairo pygobject3 - ]; + pyyaml + ]); + # with strictDeps importing "gi.repository.Gtk" fails with "gi.RepositoryError: Typelib file for namespace 'Pango', version '1.0' not found" strictDeps = false; - preBuild = '' - export LD_LIBRARY_PATH=${libpulseaudio}/lib - ''; + # no tests included + doCheck = false; + + pythonImportsCheck = [ "volctl" ]; preFixup = '' glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} - - gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH : "${libpulseaudio}/lib" - ) + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${libpulseaudio}/lib") ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 7bfb9e5739223..f7d9896431cae 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.14"; + version = "1.1.15"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1fpdj73cgp96xwasdcifxl7q2pr1my2f4vfdjpv771llri3hgfvx"; + sha256 = "1g62sdzcw3zx4ccky125ciwnzx6z9kwyvskvp7ijmqxqk3nrxjs9"; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index 25e72c1b880d6..e954163b9e847 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "blueberry"; - version = "1.3.9"; + version = "1.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "0llvz1h2dmvhvwkkvl0q4ggi1nmdbllw34ppnravs5lybqkicyw9"; + sha256 = "19kmjp686h7lwmw5n7fc9giqbqm757pkbn42nfwlmasvzqsqlnz6"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index ee2af363a5668..5b2a4e3224213 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -6,13 +6,13 @@ assert fuseSupport -> fuse3 != null; stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "2020-08-25"; + version = "2020-11-17"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; - rev = "487ddeb03c574e902c5b749b4307e87e2150976a"; - sha256 = "1pcid7apxmbl9dyvxcqby3k489wi69k8pl596ddzmkw5gmhgvgid"; + rev = "41bec63b265a38dd9fa168b6042ea5bf07135048"; + sha256 = "1y3187kpw1bmnl97isv28k2sw8cmrnsn31a0dw745adwm0n7z6fj"; }; postPatch = '' @@ -22,11 +22,7 @@ stdenv.mkDerivation { "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ''; - enableParallelBuilding = true; - - nativeBuildInputs = [ - pkgconfig - ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libuuid libscrypt libsodium keyutils liburcu zlib libaio @@ -34,22 +30,14 @@ stdenv.mkDerivation { ] ++ stdenv.lib.optional fuseSupport fuse3; doCheck = false; # needs bcachefs module loaded on builder - - checkFlags = [ - "BCACHEFS_TEST_USE_VALGRIND=no" - ]; - - checkInputs = [ - valgrind - ]; + checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ]; + checkInputs = [ valgrind ]; preCheck = stdenv.lib.optionalString fuseSupport '' rm tests/test_fuse.py ''; - installFlags = [ - "PREFIX=${placeholder "out"}" - ]; + installFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "Tool for managing bcachefs filesystems"; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index f495b56e32523..a4e6bc1182be6 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,25 +1,17 @@ -{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline, +{stdenv, fetchFromGitHub, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline, autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite, liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, rsync, glibc, rpcsvc-proto, libtirpc }: let - s = - rec { - baseName="glusterfs"; - # NOTE: On each glusterfs release, it should be checked if gluster added - # new, or changed, Python scripts whose PYTHONPATH has to be set in - # `postFixup` below, and whose runtime deps need to go into - # `nativeBuildInputs`. - # The command - # find /nix/store/...-glusterfs-.../ -name '*.py' -executable - # can help with finding new Python scripts. - version = "7.6"; - name="${baseName}-${version}"; - url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "0zdcv2jk8dp67id8ic30mkn97ccp07jf20g7v09a5k31pw9aqyih"; - }; + # NOTE: On each glusterfs release, it should be checked if gluster added + # new, or changed, Python scripts whose PYTHONPATH has to be set in + # `postFixup` below, and whose runtime deps need to go into + # `nativeBuildInputs`. + # The command + # find /nix/store/...-glusterfs-.../ -name '*.py' -executable + # can help with finding new Python scripts. buildInputs = [ fuse bison flex_2_5_35 openssl ncurses readline @@ -60,17 +52,18 @@ let which # which xfsprogs # xfs_info ]; -in -stdenv.mkDerivation -{ - inherit (s) name version; +in stdenv.mkDerivation rec { + pname = "glusterfs"; + version = "8.3"; + + src = fetchFromGitHub { + owner = "gluster"; + repo = pname; + rev = "v${version}"; + sha256 = "09vvbymiacz2pzwnq6f2dd7g2zszzsivdncz45sh977v3z0n84az"; + }; inherit buildInputs propagatedBuildInputs; - patches = [ - # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1489610 is fixed - ./glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch - ]; - postPatch = '' sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am substituteInPlace libglusterfs/src/glusterfs/lvm-defaults.h \ @@ -91,7 +84,7 @@ stdenv.mkDerivation # but fails when the version is empty. # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705 preConfigure = '' - echo "v${s.version}" > VERSION + echo "v${version}" > VERSION ./autogen.sh export PYTHON=${python3}/bin/python ''; @@ -109,7 +102,7 @@ stdenv.mkDerivation postInstall = '' cp -r $out/$out/* $out rm -r $out/nix - ''; + ''; postFixup = '' # glusterd invokes `gluster` and other utilities when telling other glusterd nodes to run commands. @@ -153,7 +146,7 @@ stdenv.mkDerivation wrapProgram $out/share/glusterfs/scripts/eventsdash.py --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH" wrapProgram $out/libexec/glusterfs/glusterfind/brickfind.py --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH" wrapProgram $out/libexec/glusterfs/glusterfind/changelog.py --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH" - ''; + ''; doInstallCheck = true; @@ -187,12 +180,7 @@ stdenv.mkDerivation rm -r $out/bin/conf.py ''; - src = fetchurl { - inherit (s) url sha256; - }; - meta = with stdenv.lib; { - inherit (s) version; description = "Distributed storage system"; homepage = "https://www.gluster.org"; license = licenses.lgpl3Plus; # dual licese: choice of lgpl3Plus or gpl2 diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch deleted file mode 100644 index f08d73cf3a654..0000000000000 --- a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f523afac49e24ecc0fa4ad85195135689cf445f0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me> -Date: Wed, 27 Sep 2017 21:36:41 +0200 -Subject: [PATCH] Fix "glusterfind saves var data under $prefix instead of - localstatedir". Fixes #1489610 - -Change-Id: Id2362c20f34346c37acfb9eb1ad105d0b7b8b60f ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index f87d8a454..b4d3f5d10 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1118,7 +1118,7 @@ if test "x$exec_prefix" = xNONE; then - exec_prefix="$(eval echo $prefix)" - fi - GLUSTERFS_LIBEXECDIR="$(eval echo $libexecdir)/glusterfs" --GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd" -+GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/lib/misc/glusterfsd" - prefix=$old_prefix - exec_prefix=$old_exec_prefix - --- -2.12.0 - diff --git a/pkgs/tools/graphics/directx-shader-compiler/default.nix b/pkgs/tools/graphics/directx-shader-compiler/default.nix new file mode 100644 index 0000000000000..4e74d2c443f11 --- /dev/null +++ b/pkgs/tools/graphics/directx-shader-compiler/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, cmake, python3, git }: + +stdenv.mkDerivation rec { + pname = "directx-shader-compiler"; + version = "1.5.2010"; + + # Put headers in dev, there are lot of them which aren't necessary for + # using the compiler binary. + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "DirectXShaderCompiler"; + rev = "v${version}"; + sha256 = "0ccfy1bfp0cm0pq63ri4yl1sr3fdn1a526bsnakg4bl6z4fwrnnj"; + # We rely on the side effect of leaving the .git directory here for the + # version-grabbing functionality of the build system. + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake git python3 ]; + + configurePhase = '' + # Requires some additional flags to cmake from a file in the repo + additionalCMakeFlags=$(< utils/cmake-predefined-config-params) + cmakeFlags="$additionalCMakeFlags''${cmakeFlags:+ $cmakeFlags}" + cmakeConfigurePhase + ''; + + # The default install target installs heaps of LLVM stuff. + # + # Upstream issue: https://github.com/microsoft/DirectXShaderCompiler/issues/3276 + # + # The following is based on the CI script: + # https://github.com/microsoft/DirectXShaderCompiler/blob/master/appveyor.yml#L63-L66 + installPhase = '' + mkdir -p $out/bin $out/lib $dev/include + mv bin/dxc* $out/bin/ + mv lib/libdxcompiler.so* lib/libdxcompiler.*dylib $out/lib/ + cp -r $src/include/dxc $dev/include/ + ''; + + meta = with stdenv.lib; { + description = "A compiler to compile HLSL programs into DXIL and SPIR-V"; + homepage = "https://github.com/microsoft/DirectXShaderCompiler"; + platforms = with platforms; linux ++ darwin; + license = licenses.ncsa; + maintainers = with maintainers; [ expipiplus1 ]; + }; +} diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index a65f5ce455c3f..cdec842700522 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -79,6 +79,8 @@ stdenv.mkDerivation { --replace /usr/bin/vimdot $out/bin/vimdot \ ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = "https://graphviz.org"; description = "Graph visualization tools"; diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index 19a0e26d9ccfc..1d3696a8cd249 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -43,5 +43,10 @@ stdenv.mkDerivation rec { license = licenses.publicDomain; maintainers = with maintainers; [ rycee ]; platforms = platforms.all; + # https://github.com/NixOS/nixpkgs/issues/90828 + knownVulnerabilities = [ + "CVE-2020-6624" + "CVE-2020-6625" + ]; }; } diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix index 2105ad0ae0178..da79110f9a82a 100644 --- a/pkgs/tools/misc/barman/default.nix +++ b/pkgs/tools/misc/barman/default.nix @@ -4,12 +4,12 @@ buildPythonApplication rec { pname = "barman"; - version = "2.11"; + version = "2.12"; outputs = [ "out" "man" ]; src = fetchurl { url = "mirror://sourceforge/pgbarman/${version}/barman-${version}.tar.gz"; - sha256 = "0w5lh4aavab9ynfy2mq09ga6j4vss4k0vlc3g6f5a9i4175g9pmr"; + sha256 = "Ts8I6tlP2GRp90OIIKXy+cRWWvUO3Sm86zq2dtVP5YE="; }; propagatedBuildInputs = [ dateutil argh psycopg2 boto3 argcomplete ]; diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 815129f7f0f74..a671090460ea0 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -6,16 +6,17 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.17.1"; + version = "3.2.35.1"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "156zpjyw8w4y23aa60mvg3d3mr0kzfq5jkl7ixgahq33zpc17ms8"; + sha256 = "s2wnwcdrcJLG5NhugSkntBCYfPuv3T/9+PclbmK0BJ4="; }; + nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ - boost cmake extra-cmake-modules kparts.dev kpmcore.out kservice.dev + boost kparts.dev kpmcore.out kservice.dev libatasmart libxcb libyamlcpp parted polkit-qt python qtbase qtquickcontrols qtsvg qttools qtwebengine.dev util-linux ]; @@ -32,18 +33,14 @@ mkDerivation rec { POLKITQT-1_POLICY_FILES_INSTALL_DIR = "$(out)/share/polkit-1/actions"; - patchPhase = '' + postPatch = '' sed -e "s,/usr/bin/calamares,$out/bin/calamares," \ -i calamares.desktop \ -i com.github.calamares.calamares.policy sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \ - -i src/modules/locale/timezonewidget/localeconst.h \ -i src/modules/locale/SetTimezoneJob.cpp - sed -e 's,/usr/share/i18n/locales,${glibc.out}/share/i18n/locales,' \ - -i src/modules/locale/timezonewidget/localeconst.h - sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \ -i src/modules/keyboard/keyboardwidget/keyboardglobal.h @@ -56,8 +53,8 @@ mkDerivation rec { meta = with lib; { description = "Distribution-independent installer framework"; - license = licenses.gpl3; - maintainers = with lib.maintainers; [ manveru ]; + license = with licenses; [ gpl3Plus bsd2 ]; + maintainers = with maintainers; [ manveru ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix index 8aea37ebddff4..8d6e464e9bb05 100644 --- a/pkgs/tools/misc/clac/default.nix +++ b/pkgs/tools/misc/clac/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchFromGitHub }: + stdenv.mkDerivation rec { pname = "clac"; - version = "0.0.0.20170503"; + version = "0.3.3"; src = fetchFromGitHub { owner = "soveran"; repo = "clac"; - rev = "e92bd5cbab0d694cef945e3478820c9505e06f04"; - sha256 = "0j8p1npgq32s377c9lw959h5i2csq4yb27cvg7av17bji46816bv"; + rev = version; + sha256 = "rsag8MWl/udwXC0Gj864fAuQ6ts1gzrN2N/zelazqjE="; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -17,12 +18,12 @@ stdenv.mkDerivation rec { cp README* LICENSE "$out/share/doc/${pname}" ''; - meta = { + meta = with stdenv.lib; { inherit version; description = "Interactive stack-based calculator"; - license = stdenv.lib.licenses.bsd2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; homepage = "https://github.com/soveran/clac"; + license = licenses.bsd2; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/cod/default.nix b/pkgs/tools/misc/cod/default.nix index 945f4c61f1d2a..6dad6173ed4b9 100644 --- a/pkgs/tools/misc/cod/default.nix +++ b/pkgs/tools/misc/cod/default.nix @@ -4,8 +4,6 @@ buildGoModule rec { pname = "cod"; version = "unstable-2020-09-10"; - goPackagePath = "cod"; - src = fetchFromGitHub { owner = "dim-an"; repo = pname; diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix new file mode 100644 index 0000000000000..8c43e2b903cae --- /dev/null +++ b/pkgs/tools/misc/code-minimap/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "code-minimap"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "wfxr"; + repo = pname; + rev = "v${version}"; + sha256 = "03azqy4i15kfpd0gzjaw2di9xva4xdf95yb65b93z3y9y5wy4krc"; + }; + + cargoSha256 = "1rxrdavj07i7qa5rf1i3aj7zdcp7c6lrg8yiy75r6lm4g98izzww"; + + meta = with stdenv.lib; { + description = "A high performance code minimap render"; + homepage = "https://github.com/wfxr/code-minimap"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ bsima ]; + }; +} diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix index 29456f54cd169..ed8a11e182c9b 100644 --- a/pkgs/tools/misc/duf/default.nix +++ b/pkgs/tools/misc/duf/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { homepage = "https://github.com/muesli/duf/"; description = "Disk Usage/Free Utility"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ petabyteboy penguwin ]; }; } diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 465e30e76157f..d1d6bc1cb101c 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -2,17 +2,31 @@ python3.pkgs.buildPythonApplication rec { pname = "esptool"; - version = "2.7"; + version = "3.0"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "1p5hx0rhs986ffqz78rdxg7jayndsq632399xby39k17kvd3mb31"; + sha256 = "1y022qlcdgdx5a88lkc3sqavklz494afbfyh100lp7xfk3f2mjln"; }; - checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order openssl ]; - propagatedBuildInputs = with python3.pkgs; [ pyserial pyaes ecdsa ]; + checkInputs = with python3.pkgs; + [ flake8 flake8-future-import flake8-import-order openssl ]; + propagatedBuildInputs = with python3.pkgs; + [ pyserial pyaes ecdsa reedsolo bitstring cryptography ]; + + # wrapPythonPrograms will overwrite esptool.py with a bash script, + # but espefuse.py tries to import it. Since we don't add any binary paths, + # use patchPythonScript directly. + dontWrapPythonPrograms = true; + postFixup = '' + buildPythonPath "$out $pythonPath" + for f in $out/bin/*.py; do + echo "Patching $f" + patchPythonScript "$f" + done + ''; meta = with stdenv.lib; { description = "ESP8266 and ESP32 serial bootloader utility"; diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index d593d677cc324..f84b0096d0446 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -1,5 +1,5 @@ { - stdenv, + clangStdenv, fetchFromGitHub, opencl-headers, cmake, @@ -16,7 +16,11 @@ cli11 }: -stdenv.mkDerivation rec { +# Note that this requires clang < 9.0 to build, and currently +# clangStdenv provides clang 7.1 which satisfies the requirement. +let stdenv = clangStdenv; + +in stdenv.mkDerivation rec { pname = "ethminer"; version = "0.18.0"; @@ -71,8 +75,5 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p ]; license = licenses.gpl2; - # Doesn't build with gcc9, and if overlayed to use gcc8 stdenv fails on CUDA issues. - broken = true; }; - } diff --git a/pkgs/tools/misc/fbcat/default.nix b/pkgs/tools/misc/fbcat/default.nix new file mode 100644 index 0000000000000..4f640f13a27fe --- /dev/null +++ b/pkgs/tools/misc/fbcat/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub } : + +stdenv.mkDerivation rec { + pname = "fbcat"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "jwilk"; + repo = pname; + rev = version; + sha256 = "08y79br4a4cgkjnslw0hw57441ybsapaw7wjdbak19mv9lnl5ll9"; + }; + + # hardcoded because makefile target "install" depends on libxslt dependencies from network + # that are just too hard to monkeypatch here + # so this is the simple fix. + installPhase = '' + mkdir -p $out + install -d $out/bin + install -m755 fbcat $out/bin/ + install -m755 fbgrab $out/bin/ + install -d $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + homepage = "http://jwilk.net/software/fbcat"; + description = "Framebuffer screenshot tool"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index 5e5154111dc98..b15eba8b7bc3d 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchpatch , fetchurl +, fixDarwinDylibNames , cmake , libjpeg , zlib @@ -17,6 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames ]; buildInputs = [ diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index 01b135dbf871c..13c630718b1d2 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -6,7 +6,7 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) ffi (1.13.1) - html-proofer (3.18.0) + html-proofer (3.18.2) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix index 13f3aed73378b..49f7726fc8be7 100644 --- a/pkgs/tools/misc/html-proofer/gemset.nix +++ b/pkgs/tools/misc/html-proofer/gemset.nix @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1icjr9hg8gk1dsy9gnhffkamh4d8yfkmqa4kfzdpbnvr50qvfmwz"; + sha256 = "06vbbm8qdmw4955522zh9wqn2214ajsf70y0vymxgl7dlwjd2pz0"; type = "gem"; }; - version = "3.18.0"; + version = "3.18.2"; }; mercenary = { groups = ["default"]; diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix index f81d9b7266b69..2155b8676becc 100644 --- a/pkgs/tools/misc/kermit/default.nix +++ b/pkgs/tools/misc/kermit/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation { tar xvzf $src ''; - patchPhase = '' + postPatch = '' sed -i -e 's@-I/usr/include/ncurses@@' \ -e 's@/usr/local@'"$out"@ makefile ''; - buildPhase = "make -f makefile linux LNKFLAGS='-lcrypt -lresolv'"; + buildPhase = "make -f makefile linux KFLAGS='-D_IO_file_flags' LNKFLAGS='-lcrypt -lresolv'"; installPhase = '' mkdir -p $out/bin @@ -35,6 +35,5 @@ stdenv.mkDerivation { license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; - broken = true; }; } diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index da6fa0a338ef1..c3cb3200e06f0 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lf"; - version = "17"; + version = "18"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0hs70hbbwz9kbbf13l2v32yv70n4aw8sz7rky82qdcqcpnpisjq8"; + sha256 = "1xzy85lz99kwzvpkkaqlylynn57nhn76dff3cxy304d23y3r26w6"; }; - vendorSha256 = "1xjanlq67b6n07pha6ljgnl3n2ks4x3albvca317l68cvjiw3shs"; + vendorSha256 = "12njqs39ympi2mqal1cdn0smp80yzcs8xmca1iih8pbmxv51r2gg"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index 8d71f75622c7a..7e824cf90ca4f 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchzip }: buildGoModule rec { pname = "mutagen"; @@ -13,10 +13,26 @@ buildGoModule rec { vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l"; + agents = fetchzip { + name = "mutagen-agents-${version}"; + # The package architecture does not matter since all packages contain identical mutagen-agents.tar.gz. + url = "https://github.com/mutagen-io/mutagen/releases/download/v${version}/mutagen_linux_amd64_v${version}.tar.gz"; + stripRoot = false; + extraPostFetch = '' + rm $out/mutagen # Keep only mutagen-agents.tar.gz. + ''; + sha256 = "0k8iif09kvxfxx6qm5qmkf3lr7ar6i98ivkndimj680ah9v1hkj8"; + }; + doCheck = false; subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ]; + postInstall = '' + install -d $out/libexec + ln -s ${agents}/mutagen-agents.tar.gz $out/libexec/ + ''; + meta = with lib; { description = "Make remote development work with your local tools"; homepage = "https://mutagen.io/"; diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 11cb0dcf554b6..392de7d1bd94f 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-direnv"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - sha256 = "sha256-xMz6e0OLeB3eltGrLV3Hew0lMjH5LSgqJ1l7JT2Ho/M="; + sha256 = "sha256-/mlM1EeUlr1nTUJ5rB41idzk3Mfy/htjjPUARYDFpb0="; }; # Substitute instead of wrapping because the resulting file is diff --git a/pkgs/tools/misc/nvimpager/default.nix b/pkgs/tools/misc/nvimpager/default.nix new file mode 100644 index 0000000000000..2c10c9fbfbb57 --- /dev/null +++ b/pkgs/tools/misc/nvimpager/default.nix @@ -0,0 +1,47 @@ +{ fetchFromGitHub +, stdenv +, ncurses, neovim, procps +, pandoc, lua51Packages, util-linux +}: + +stdenv.mkDerivation rec { + pname = "nvimpager"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "lucc"; + repo = pname; + rev = "v${version}"; + sha256 = "1xy5387szfw0bp8dr7d4z33wd4xva7q219rvz8gc0vvv1vsy73va"; + }; + + buildInputs = [ + ncurses # for tput + procps # for nvim_get_proc() which uses ps(1) + ]; + nativeBuildInputs = [ pandoc ]; + + makeFlags = [ "PREFIX=$(out)" ]; + buildFlags = [ "nvimpager.configured" ]; + preBuild = '' + patchShebangs nvimpager + substituteInPlace nvimpager --replace ':-nvim' ':-${neovim}/bin/nvim' + ''; + + doCheck = true; + checkInputs = [ lua51Packages.busted util-linux neovim ]; + checkPhase = ''script -c "busted --lpath './?.lua' test"''; + + meta = with stdenv.lib; { + description = "Use neovim as pager"; + longDescription = '' + Use neovim as a pager to view manpages, diffs, etc with nvim's syntax + highlighting. Includes a cat mode to print highlighted files to stdout + and a ansi esc mode to highlight ansi escape sequences in neovim. + ''; + homepage = "https://github.com/lucc/nvimpager"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.lucc ]; + }; +} diff --git a/pkgs/tools/misc/patdiff/default.nix b/pkgs/tools/misc/patdiff/default.nix index e0b54e56081dd..dcd06ce1d2b70 100644 --- a/pkgs/tools/misc/patdiff/default.nix +++ b/pkgs/tools/misc/patdiff/default.nix @@ -4,8 +4,8 @@ with ocamlPackages; janePackage { pname = "patdiff"; - hash = "1yqvxdmkgcwgx3npgncpdqwkpdxiqr1q41wci7589s8z7xi5nwyz"; - buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre shell ]; + hash = "1yslj6xxyv8rx8y5s1civ1zq8y6vvxmkszdds958zdm1p1ign54r"; + buildInputs = [ core patience_diff ocaml_pcre ]; meta = { description = "File Diff using the Patience Diff algorithm"; }; diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index 5dd83c4887b14..1db8d00a90218 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -1,36 +1,48 @@ -{ stdenv, fetchFromGitHub, makeWrapper, lrzsz, IOKit }: - -assert stdenv.isDarwin -> IOKit != null; - -with stdenv.lib; +{ stdenv +, fetchFromGitHub +, installShellFiles +, lrzsz +, IOKit +}: stdenv.mkDerivation rec { pname = "picocom"; - version = "3.1"; + # last tagged release is 3.1 but 3.2 is still considered a release + version = "3.2a"; + # upstream is quiet as the original author is no longer active since March 2018 src = fetchFromGitHub { owner = "npat-efault"; repo = "picocom"; - rev = version; - sha256 = "1vvjydqf0ax47nvdyyl67jafw5b3sfsav00xid6qpgia1gs2r72n"; + rev = "1acf1ddabaf3576b4023c4f6f09c5a3e4b086fb8"; + sha256 = "sha256-cs2bxqZfTbnY5d+VJ257C5hssaFvYup3tBKz68ROnAo="; }; - buildInputs = [ makeWrapper ] - ++ optionals stdenv.isDarwin [ IOKit ]; + postPatch = '' + substituteInPlace Makefile \ + --replace '.picocom_history' '.cache/picocom_history' - installPhase = '' - mkdir -p $out/bin $out/share/man/man1 - cp picocom $out/bin - cp picocom.1 $out/share/man/man1 + substituteInPlace picocom.c \ + --replace '"rz -vv"' '"${lrzsz}/bin/rz -vv"' \ + --replace '"sz -vv"' '"${lrzsz}/bin/sz -vv"' + ''; - wrapProgram $out/bin/picocom \ - --prefix PATH ":" "${lrzsz}/bin" + enableParallelBuilding = true; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit; + + installPhase = '' + install -Dm555 -t $out/bin picocom + installManPage picocom.1 + installShellCompletion --bash bash_completion/picocom ''; - meta = { + meta = with stdenv.lib; { description = "Minimal dumb-terminal emulation program"; homepage = "https://github.com/npat-efault/picocom/"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix new file mode 100644 index 0000000000000..11db08dd97350 --- /dev/null +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub, maven, jdk }: + +let + version = "1.2020.14"; + + src = fetchFromGitHub { + owner = "plantuml"; + repo = "plantuml-server"; + rev = "v${version}"; + sha256 = "08g6ddpkly5yhjhw7gpsanyspar1752jy9cypwxsqrdzqrv738b8"; + }; + + # perform fake build to make a fixed-output derivation out of the files downloaded from maven central + deps = stdenv.mkDerivation { + name = "plantuml-server-${version}-deps"; + inherit src; + buildInputs = [ jdk maven ]; + buildPhase = '' + while mvn package -Dmaven.repo.local=$out/.m2; [ $? = 1 ]; do + echo "timeout, restart maven to continue downloading" + done + ''; + # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside + installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1wwgyjalhlj5azggs9vvsrr54pg7gl8p36pgf6pk12rsszzl7a97"; + }; +in + +stdenv.mkDerivation rec { + pname = "plantuml-server"; + inherit version; + inherit src; + + buildInputs = [ jdk maven ]; + + buildPhase = '' + # 'maven.repo.local' must be writable so copy it out of nix store + cp -R $src repo + chmod +w -R repo + cd repo + mvn package --offline -Dmaven.repo.local=$(cp -dpR ${deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 + ''; + + installPhase = '' + mkdir -p "$out/webapps" + cp "target/plantuml.war" "$out/webapps/plantuml.war" + ''; + + meta = with stdenv.lib; { + description = "A web application to generate UML diagrams on-the-fly."; + homepage = "https://plantuml.com/"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ truh ]; + }; +} diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 04a11a9220413..6a21bc56789a1 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "1bpq4zki98vw793rvrk9qwgh62f1qwzh0cm4a3h0bif43kg836n0"; + sha256 = "1pqf7rs9b8j54rwg8i8alvf65c4jfp5q2hv3yr60aiidfjrawp34"; }; - cargoSha256 = "1486pfiv4lfzdz3hj5z6s7q8lhzrldffji3fsf10z50sm4fhq73q"; + cargoSha256 = "1wh7xywp92h3in9a2nr6sia6l3852kw4s688sr1c2wjdf2i58lsg"; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 9b38db5a7273f..e7a08877e90f3 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchFromGitHub, which, + buildPackages, enableStatic ? false, enableMinimal ? false, extraConfig ? "" @@ -16,6 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0cgbmv6qk1haj709hjx5q4sl7wgh91i459gzs1203adwc7rvk6jv"; }; + depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed for cross buildInputs = lib.optionals enableStatic [ stdenv.cc.libc stdenv.cc.libc.static ]; postPatch = "patchShebangs ."; diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index d00d737c17ce3..889c266d28e26 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yad"; - version = "6.0"; + version = "7.2"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; rev = "v${version}"; - sha256 = "07myjv0g0iwgclc6q9wkj25myhlc86ahy2lqma8vgv9i3rgy03p7"; + sha256 = "0ih97hrcra2bg8q19b8819hip1p424z1vj61cl1ym5p477rp37yx"; }; configureFlags = [ diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 053d2ae59d2a9..6a13c455fe060 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1488"; + version = "0.4.1500"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "28aec2f15e86ea1cbf9900827ade41388aa3f1ac43b4ab49999bce48f37cf9c3"; + sha256 = "5a6cc0d661fe0cd4210bf467d6c89afd8611609e402690254722c1415736da92"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 9e2afd9b06833..abb17946fbbe5 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 = "2020.12.14"; + version = "2020.12.29"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0ws2nsvn0qlnnyxz9g95ffygscfmg5npzmwbq8iyyi6b2njsb0cn"; + sha256 = "1hcr3mf63csp6lfpqszl5ibb2jhyl180s6pvbb7771jg0kdvlbbb"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix index 59149506e6c08..2b5a46435499e 100644 --- a/pkgs/tools/misc/z-lua/default.nix +++ b/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.8.7"; + version = "1.8.10"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = version; - sha256 = "14n1abv7gh4zajq471bgzpcv8l1159g00h9x83h719i9kxxsa2ba"; + sha256 = "0q0qs07kmkpjv68j2bjgsrv6shl76mssnchfv82vjf8abkf8343b"; }; dontBuild = true; @@ -20,8 +20,10 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm755 z.lua $out/bin/z - wrapProgram $out/bin/z --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so" --set _ZL_USE_LFS 1; + install -Dm755 z.lua $out/bin/z.lua + wrapProgram $out/bin/z.lua --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so" --set _ZL_USE_LFS 1; + # Create symlink for backwards compatibility. See: https://github.com/NixOS/nixpkgs/pull/96081 + ln -s $out/bin/z.lua $out/bin/z runHook postInstall ''; diff --git a/pkgs/tools/misc/zalgo/default.nix b/pkgs/tools/misc/zalgo/default.nix new file mode 100644 index 0000000000000..d9538141af00d --- /dev/null +++ b/pkgs/tools/misc/zalgo/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "zalgo"; + version = "unstable-2020-08-26"; + + src = fetchFromGitHub { + owner = "lunasorcery"; + repo = "zalgo"; + rev = "6aa1f66cfe183f8164a666730dfeaf39133cf01a"; + sha256 = "00q56yvfcj2f89wllrckvizihivqmd6l77nihb52ffqd99rdd24w"; + }; + + installPhase = '' + install -Dm755 zalgo -t $out/bin + ''; + + meta = with stdenv.lib; { + description = "Read stdin and corrupt it with combining diacritics"; + homepage = "https://github.com/lunasorcery/zalgo"; + license = licenses.unfree; + platforms = platforms.unix; + maintainers = with maintainers; [ djanatyn ]; + }; +} diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 28a418c27f28c..8cc891cce19c7 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cjdns"; - version = "21"; + version = "21.1"; src = fetchFromGitHub { owner = "cjdelisle"; repo = "cjdns"; rev = "cjdns-v${version}"; - sha256 = "1s9d8yrdrj2gviig05jhr0fnzazb88lih0amxfk0av786rvh7ymj"; + sha256 = "NOmk+vMZ8i0E2MjrUzksk+tkJ9XVVNEXlE5OOTNa+Y0="; }; buildInputs = [ which python27 nodejs ] ++ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/cjdelisle/cjdns"; description = "Encrypted networking for regular people"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index c466a48434f2b..82245f4cd26da 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -34,14 +34,14 @@ assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { pname = "curl"; - version = "7.73.0"; + version = "7.74.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-zzT+Cwe4APHAGkmabosq9Uj20OBE3KSinYikvuFG0TE="; + sha256 = "19bp3d91xq9vqwlbzq261j23mk9lz4lyka4gr2fm6dhnd3k66k8g"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix index e9987a51eaecd..f404090e5e3ac 100644 --- a/pkgs/tools/networking/httpstat/default.nix +++ b/pkgs/tools/networking/httpstat/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { pname = "httpstat"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "reorx"; repo = pname; rev = version; - sha256 = "18k2glnyzxlmry19ijmndim2vqqn3c86smd7xc3haw6k7qafifx1"; + sha256 = "sha256-zUdis41sQpJ1E3LdNwaCVj6gexi/Rk21IBUgoFISiDM="; }; doCheck = false; # No tests buildInputs = [ glibcLocales ]; diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/tools/networking/kapp/default.nix new file mode 100644 index 0000000000000..1307633852919 --- /dev/null +++ b/pkgs/tools/networking/kapp/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: +buildGoModule rec { + pname = "kapp"; + version = "0.35.0"; + + src = fetchFromGitHub { + owner = "vmware-tanzu"; + repo = "carvel-kapp"; + rev = "v${version}"; + sha256 = "1i4hpqpbwqb0yg3rx4z733zfslq3svmahfr39ss1ydylsipl02mg"; + }; + + vendorSha256 = null; + + subPackages = [ "cmd/kapp" ]; + + meta = with lib; { + description = "CLI tool that encourages Kubernetes users to manage bulk resources with an application abstraction for grouping"; + homepage = "https://get-kapp.io"; + license = licenses.asl20; + maintainers = with maintainers; [ brodes ]; + }; +} diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 3e7719c40d410..7e6f2c475ca5f 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -29,6 +29,10 @@ stdenv.mkDerivation rec { "-Wno-error=format-truncation" "-Wno-error=pointer-compare" "-Wno-error=stringop-truncation" + # The following flag allows libreswan v3.32 to work with NSS 3.22, see + # https://github.com/libreswan/libreswan/issues/334. + # This flag should not be needed for libreswan v3.33 (which is not yet released). + "-DNSS_PKCS11_2_0_COMPAT=1" ]; nativeBuildInputs = [ makeWrapper pkgconfig ]; @@ -82,7 +86,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://libreswan.org"; description = "A free software implementation of the VPN protocol based on IPSec and the Internet Key Exchange"; - platforms = platforms.linux ++ platforms.darwin ++ platforms.freebsd; + platforms = platforms.linux ++ platforms.freebsd; license = licenses.gpl2; maintainers = [ maintainers.afranchuk ]; }; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index f8a518ca4dce0..ef98f48214050 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,4 +1,5 @@ { stdenv +, pkgs , fetchurl , fetchpatch , zlib @@ -66,7 +67,9 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711' ''; - nativeBuildInputs = [ pkgconfig ] ++ optional (hpnSupport || withGssapiPatches) autoreconfHook; + nativeBuildInputs = [ pkgconfig ] + ++ optional (hpnSupport || withGssapiPatches) autoreconfHook + ++ optional withKerberos pkgs.kerberos.dev; buildInputs = [ zlib openssl libedit pam ] ++ optional withFIDO libfido2 ++ optional withKerberos kerberos; @@ -75,6 +78,22 @@ stdenv.mkDerivation rec { # Setting LD causes `configure' and `make' to disagree about which linker # to use: `configure' wants `gcc', but `make' wants `ld'. unset LD + '' + # Upstream build system does not support static build, so we fall back + # on fragile patching of configure script. + # + # libedit is found by pkgconfig, but without --static flag, required + # to get also transitive dependencies for static linkage, hence sed + # expression. + # + # Kerberos can be found either by krb5-config or by fall-back shell + # code in openssh's configure.ac. Neither of them support static + # build, but patching code for krb5-config is simpler, so to get it + # into PATH, kerberos.dev is added into buildInputs. + + optionalString stdenv.hostPlatform.isStatic '' + sed -i "s,PKGCONFIG --libs,PKGCONFIG --libs --static,g" configure + sed -i 's#KRB5CONF --libs`#KRB5CONF --libs` -lkrb5support -lkeyutils#g' configure + sed -i 's#KRB5CONF --libs gssapi`#KRB5CONF --libs gssapi` -lkrb5support -lkeyutils#g' configure ''; # I set --disable-strip because later we strip anyway. And it fails to strip diff --git a/pkgs/tools/networking/proxify/default.nix b/pkgs/tools/networking/proxify/default.nix new file mode 100644 index 0000000000000..4a75b3ca2f175 --- /dev/null +++ b/pkgs/tools/networking/proxify/default.nix @@ -0,0 +1,31 @@ +{ buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "proxify"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = "proxify"; + rev = "v${version}"; + sha256 = "15j2q9zrs8bdf72jgldkai3xbi4irk69wyjzv48r74rdgf2k49gn"; + }; + + vendorSha256 = "1x78n88ri8kph827k03x1q06zpbbbp7793xsvc376ljda5n6bqig"; + + meta = with stdenv.lib; { + description = "Proxy tool for HTTP/HTTPS traffic capture"; + longDescription = '' + This tool supports multiple operations such as request/response dump, filtering + and manipulation via DSL language, upstream HTTP/Socks5 proxy. Additionally a + replay utility allows to import the dumped traffic (request/responses with correct + domain name) into other tools by simply setting the upstream proxy to proxify. + ''; + homepage = "https://github.com/projectdiscovery/proxify"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/networking/qr-filetransfer/default.nix b/pkgs/tools/networking/qr-filetransfer/default.nix deleted file mode 100644 index bb62be6d3e243..0000000000000 --- a/pkgs/tools/networking/qr-filetransfer/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: - -buildGoPackage { - pname = "qr-filetransfer-unstable"; - version = "2018-10-22"; - - goPackagePath = "github.com/claudiodangelis/qr-filetransfer"; - - src = fetchFromGitHub { - rev = "b1e5b91aa2aa469f870c62074e879d46e353edae"; - owner = "claudiodangelis"; - repo = "qr-filetransfer"; - sha256 = "04cl3v6bzpaxp1scpsa42xxa1c1brbplq408bb7nixa98bacj4x1"; - }; - - goDeps = ./deps.nix; - - meta = with stdenv.lib; { - homepage = "https://github.com/claudiodangelis/qr-filetransfer"; - description = "Transfer files over wifi by scanning a QR code from your terminal"; - longDescription = '' - qr-filetransfer binds a web server to the address of your Wi-Fi network - interface on a random port and creates a handler for it. The default - handler serves the content and exits the program when the transfer is - complete. - ''; - license = licenses.mit; - maintainers = with maintainers; [ fgaz ]; - }; -} diff --git a/pkgs/tools/networking/qr-filetransfer/deps.nix b/pkgs/tools/networking/qr-filetransfer/deps.nix deleted file mode 100644 index a15dd96894336..0000000000000 --- a/pkgs/tools/networking/qr-filetransfer/deps.nix +++ /dev/null @@ -1,66 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "efa589957cd060542a26d2dd7832fd6a6c6c3ade"; - sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "3fb116b820352b7f0c281308a4d6250c22d94e27"; - sha256 = "084hplr4n4g5nvp70clljk428hc963460xz0ggcj3xdi4w7hhsvv"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "c88d7e5f2e24de48a200a2655ac8a0910be9a0f7"; - sha256 = "14prmzjlv9z31n6caaaq1kwi4p0mp3x4pv5r7d0575lcampa41jw"; - }; - } - { - goPackagePath = "github.com/mdp/qrterminal"; - fetch = { - type = "git"; - url = "https://github.com/mdp/qrterminal"; - rev = "6967d3624af633162b77160078e12a4c14174470"; - sha256 = "1f2zrdv9sw2a6ni1712d27cayr3f8whqagx6f0yglc5gdd9f3i2n"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "a5c9d58dba9a56f97aaa86f55e638b718c5a6c42"; - sha256 = "02qv5i7yps35p7fa81345qz7k8i73gkigj69anwmpw9rhpmzayf9"; - }; - } - { - goPackagePath = "gopkg.in/cheggaaa/pb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/cheggaaa/pb.v1"; - rev = "007b75a044e968336a69a6c0c617251ab62ac14c"; - sha256 = "0l8m5cy6fbir7nrsk985ap7dxp9qlfmh8r73g7j9zg7pfq3lkhad"; - }; - } - { - goPackagePath = "rsc.io/qr"; - fetch = { - type = "git"; - url = "https://github.com/rsc/qr"; - rev = "ca9a01fc2f9505024045632c50e5e8cd6142fafe"; - sha256 = "04yx493g0fqp8i59zjxnl4k3s0cl0kr5m8xh0ph8m10r1hkw0xr3"; - }; - } -] diff --git a/pkgs/tools/networking/qrcp/default.nix b/pkgs/tools/networking/qrcp/default.nix new file mode 100644 index 0000000000000..bf3b3936edd3c --- /dev/null +++ b/pkgs/tools/networking/qrcp/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "qrcp"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "claudiodangelis"; + repo = "qrcp"; + rev = version; + sha256 = "0rx0pzy7p3dklayr2lkmyfdc00x9v4pd5xnzydbjx12hncnkpw4l"; + }; + + vendorSha256 = "0iffy43x3njcahrxl99a71v8p7im102nzv8iqbvd5c6m14rsckqa"; + + subPackages = [ "." ]; + + meta = with lib; { + homepage = "https://claudiodangelis.com/qrcp/"; + description = "Transfer files over wifi by scanning a QR code from your terminal"; + longDescription = '' + qrcp binds a web server to the address of your Wi-Fi network + interface on a random port and creates a handler for it. The default + handler serves the content and exits the program when the transfer is + complete. + ''; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/tools/package-management/libdnf/darwin.patch b/pkgs/tools/package-management/libdnf/darwin.patch new file mode 100644 index 0000000000000..56bafb2f7b82a --- /dev/null +++ b/pkgs/tools/package-management/libdnf/darwin.patch @@ -0,0 +1,35 @@ +--- src/libdnf/hy-iutil.cpp 2020-12-02 07:53:42.000000000 -0800 ++++ src/libdnf/hy-iutil.cpp 2020-12-21 14:24:14.000000000 -0800 +@@ -22,7 +22,7 @@ + #include <errno.h> + #include <dirent.h> + #include <fcntl.h> +-#include <linux/limits.h> ++#include <limits.h> + #include <pwd.h> + #include <unistd.h> + #include <stdio.h> +--- src/libdnf/hy-util.cpp 2020-12-02 07:53:42.000000000 -0800 ++++ src/libdnf/hy-util.cpp 2020-12-21 14:23:21.000000000 -0800 +@@ -24,7 +24,20 @@ + #include <ctype.h> + #include <sys/utsname.h> + #include <sys/stat.h> +-#include <sys/auxv.h> ++ ++// Darwin compatibility hacks ++typedef int auxv_t; ++#ifndef AT_HWCAP2 ++#define AT_HWCAP2 26 ++#endif ++#ifndef AT_HWCAP ++#define AT_HWCAP 16 ++#endif ++static unsigned long getauxval(unsigned long type) ++{ ++ unsigned long ret = 0; ++ return ret; ++} + + // hawkey + #include "dnf-types.h" diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix new file mode 100644 index 0000000000000..480222a45de2d --- /dev/null +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -0,0 +1,66 @@ +{ gcc9Stdenv, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check +, pcre, json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm }: + +gcc9Stdenv.mkDerivation rec { + pname = "libdnf"; + version = "0.55.2"; + + src = fetchFromGitHub { + owner = "rpm-software-management"; + repo = pname; + rev = version; + sha256 = "0hiydwfa90nsrqk5ffa6ks1g73wnsgjgq7z7gwq9jj76a7gpfbfq"; + }; + + patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + + nativeBuildInputs = [ + cmake + gettext + pkg-config + ]; + + buildInputs = [ + check + gpgme + openssl + json_c + libsmartcols + libyaml + libmodulemd + ]; + + propagatedBuildInputs = [ + sqlite + libsolv + librepo + rpm + ]; + + # See https://github.com/NixOS/nixpkgs/issues/107430 + prePatch = '' + cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake cmake/modules/ + ''; + + # See https://github.com/NixOS/nixpkgs/issues/107428 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "enable_testing()" "" \ + --replace "add_subdirectory(tests)" "" + ''; + + cmakeFlags = [ + "-DWITH_GTKDOC=OFF" + "-DWITH_HTML=OFF" + "-DWITH_BINDINGS=OFF" + "-DWITH_ZCHUNK=OFF" + ]; + + meta = with stdenv.lib; { + description = "Package management library."; + homepage = "https://github.com/rpm-software-management/libdnf"; + license = licenses.gpl2Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ rb2k ]; + }; +} diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 0e2cec6852065..f636560844b2a 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -35,11 +35,12 @@ stdenv.mkDerivation rec { libxml2 glib openssl - zchunk curl check gpgme - ]; + ] + # zchunk currently has issues compiling in darwin, fine in linux + ++ stdenv.lib.optional stdenv.isLinux zchunk; # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here propagatedBuildInputs = [ @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}" - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin "-DWITH_ZCHUNK=OFF"; postFixup = '' moveToOutput "lib/${python.libPrefix}" "$py" @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages"; homepage = "https://rpm-software-management.github.io/librepo/"; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ copumpkin ]; }; } diff --git a/pkgs/tools/package-management/microdnf/default.nix b/pkgs/tools/package-management/microdnf/default.nix new file mode 100644 index 0000000000000..de473cf6a8988 --- /dev/null +++ b/pkgs/tools/package-management/microdnf/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, cmake, gettext, libdnf, pkg-config, glib, libpeas, libsmartcols, help2man }: + +stdenv.mkDerivation rec { + pname = "microdnf"; + version = "3.6.0"; + + src = fetchFromGitHub { + owner = "rpm-software-management"; + repo = pname; + rev = version; + sha256 = "0a7lc3qsnblvznzsz3544l3n84184xi85zf7c3m3jhnmpmxsg39h"; + }; + + nativeBuildInputs = [ pkg-config cmake gettext help2man ]; + buildInputs = [ libdnf glib libpeas libsmartcols ]; + + meta = with stdenv.lib; { + description = "Lightweight implementation of dnf in C"; + homepage = "https://github.com/rpm-software-management/microdnf"; + license = licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ rb2k ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 54492d173e821..34f6359361249 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "nix-update"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "12fsxy2rv2dgk8l10ymp10j01jkcbn9w0fv5iyb5db85q4xsrsm5"; + sha256 = "sha256-cMllWFPK6pwqrocjkZKjnELIdtW4tj5Yu6AMw7Zd2JU="; }; makeWrapperArgs = [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c17a1a82d9f33..bfc67ccac6329 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -188,10 +188,10 @@ in rec { nix = nixStable; nixStable = callPackage common (rec { - name = "nix-2.3.9"; + name = "nix-2.3.10"; src = fetchurl { url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "72331fdba220517a0ccabcf5c9735703c31674bfb4ef0b64da5d8f715d6022fa"; + sha256 = "a8a85e55de43d017abbf13036edfb58674ca136691582f17080c1cd12787b7ab"; }; inherit storeDir stateDir confDir boehmgc; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 8acf57570d7c8..ac470d3e26a52 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,21 +1,22 @@ -{ stdenv, lib +{ stdenv, lib, fetchpatch , pkgconfig, autoreconfHook -, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages +, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages +, sqlite }: stdenv.mkDerivation rec { pname = "rpm"; - version = "4.15.1"; + version = "4.16.1.2"; src = fetchurl { url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2"; - sha256 = "0c6jwail90fhha3bpx70w4a2i8ycxwvnx6zwxm121l8wc3wlbvyx"; + sha256 = "1k6ank2aad7r503w12m6m494mxr6iccj52wqhwbc94pwxsf34mw3"; }; outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ] + buildInputs = [ cpio zlib bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements @@ -28,14 +29,23 @@ stdenv.mkDerivation rec { "--with-external-db" "--with-lua" "--enable-python" + "--enable-ndb" + "--enable-sqlite" "--localstatedir=/var" "--sharedstatedir=/com" ]; - postPatch = '' - # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here - substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable} + # Small fixes for ndb on darwin + # https://github.com/rpm-software-management/rpm/pull/1465 + patches = [ + (fetchpatch { + name = "darwin-support.patch"; + url = "https://github.com/rpm-software-management/rpm/commit/2d20e371d5e38f4171235e5c64068cad30bda557.patch"; + sha256 = "0p3j5q5a4hl357maf7018k3826jhcpqg6wfrnccrkv30g0ayk171"; + }) + ]; + postPatch = '' substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' "" ''; diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix new file mode 100644 index 0000000000000..21bf7d4664cc9 --- /dev/null +++ b/pkgs/tools/security/dnsx/default.nix @@ -0,0 +1,31 @@ +{ buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "dnsx"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = "dnsx"; + rev = "v${version}"; + sha256 = "1pgq21pbnz2dm272zrhd455njj5vg4kywpd230acj675nlgir6y1"; + }; + + vendorSha256 = "0j2cqvskzxbyfrvsv4gm4qwfjm0digizcg157z5iignnknddajax"; + + meta = with stdenv.lib; { + description = "Fast and multi-purpose DNS toolkit"; + longDescription = '' + dnsx is a fast and multi-purpose DNS toolkit allow to run multiple + probers using retryabledns library, that allows you to perform + multiple DNS queries of your choice with a list of user supplied + resolvers. + ''; + homepage = "https://github.com/projectdiscovery/dnsx"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/ffuf/default.nix b/pkgs/tools/security/ffuf/default.nix new file mode 100644 index 0000000000000..77a286df4c695 --- /dev/null +++ b/pkgs/tools/security/ffuf/default.nix @@ -0,0 +1,34 @@ +{ buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "ffuf"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1jb2x0ybcb9zkqm7flpmr0hd3171xvnn6kxmfcgds4x8l9fbmxnr"; + }; + + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + + # tests don't pass due to an issue with the memory addresses + # https://github.com/ffuf/ffuf/issues/367 + doCheck = false; + + meta = with stdenv.lib; { + description = "Fast web fuzzer written in Go"; + longDescription = '' + FFUF, or “Fuzz Faster you Fool” is an open source web fuzzing tool, + intended for discovering elements and content within web applications + or web servers. + ''; + homepage = "https://github.com/ffuf/ffuf"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/gau/default.nix b/pkgs/tools/security/gau/default.nix new file mode 100644 index 0000000000000..cfbae951526ca --- /dev/null +++ b/pkgs/tools/security/gau/default.nix @@ -0,0 +1,29 @@ +{ buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "gau"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "lc"; + repo = pname; + rev = "v${version}"; + sha256 = "1srbql603vvlxc6p1ibw0982icdq9kcr1iamxlr8bmgldbm8215w"; + }; + + vendorSha256 = "17ag2wvaxv2dyx3yx3fvlf36ww4a44660pn4gvpbrwacsan9as5s"; + + meta = with stdenv.lib; { + description = "Tool to fetch known URLs"; + longDescription = '' + getallurls (gau) fetches known URLs from various sources for any + given domain. + ''; + homepage = "https://github.com/lc/gau"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/gospider/default.nix b/pkgs/tools/security/gospider/default.nix new file mode 100644 index 0000000000000..7211c65d536be --- /dev/null +++ b/pkgs/tools/security/gospider/default.nix @@ -0,0 +1,33 @@ +{ buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "gospider"; + version = "1.1.4"; + + src = fetchFromGitHub { + owner = "jaeles-project"; + repo = pname; + rev = "${version}"; + sha256 = "03gl8y2047iwa6bhmayyds3li21wy3sw1x4hpp9zgqgi95039q86"; + }; + + vendorSha256 = "0dc4ddi26i38c5rvy9zbal27a7qvn17h64w1yhbig4iyb79b18ym"; + + # tests require internet access and API keys + doCheck = false; + + meta = with stdenv.lib; { + description = "Fast web spider written in Go"; + longDescription = '' + GoSpider is a fast web crawler that parses sitemap.xml and robots.txt file. + It can generate and verify link from JavaScript files, extract URLs from + various sources and can detect subdomains from the response source. + ''; + homepage = "https://github.com/jaeles-project/gospider"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix new file mode 100644 index 0000000000000..c7d83075e9da4 --- /dev/null +++ b/pkgs/tools/security/httpx/default.nix @@ -0,0 +1,30 @@ +{ buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "httpx"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = "httpx"; + rev = "v${version}"; + sha256 = "15ihc5926kbai16i59c7bmvgd162qq9dpd52g4vrp7dq4jrz155m"; + }; + + vendorSha256 = "0fg93vhwpx113fpw8qg4ram4bdh6a8x3a36pr1c962s4vhrabwy2"; + + meta = with stdenv.lib; { + description = "Fast and multi-purpose HTTP toolkit"; + longDescription = '' + httpx is a fast and multi-purpose HTTP toolkit allow to run multiple + probers using retryablehttp library, it is designed to maintain the + result reliability with increased threads. + ''; + homepage = "https://github.com/projectdiscovery/httpx"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/naabu/default.nix b/pkgs/tools/security/naabu/default.nix new file mode 100644 index 0000000000000..a2295d87fec76 --- /dev/null +++ b/pkgs/tools/security/naabu/default.nix @@ -0,0 +1,38 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, libpcap +}: + +buildGoModule rec { + pname = "naabu"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = "naabu"; + rev = "v${version}"; + sha256 = "05iybf7q3y0piyw202yzld89fiz2dv2pmnpm1pd905phk5a23n1x"; + }; + + vendorSha256 = "111qvkqdcdgir3dz267xckzlnfx72flnyi7ki7fa6ml7mkfyf70y"; + + buildInputs = [ libpcap ]; + + preBuild = '' + mv v2/* . + ''; + + meta = with lib; { + description = "Fast SYN/CONNECT port scanner"; + longDescription = '' + Naabu is a port scanning tool written in Go that allows you to enumerate + valid ports for hosts in a fast and reliable manner. It is a really simple + tool that does fast SYN/CONNECT scans on the host/list of hosts and lists + all ports that return a reply. + ''; + homepage = "https://github.com/projectdiscovery/naabu"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix index 4f4f660e20f4a..8c0d31853ff9e 100644 --- a/pkgs/tools/security/neopg/default.nix +++ b/pkgs/tools/security/neopg/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { ''; maintainers = with maintainers; [ erictapen ]; platforms = platforms.linux; + broken = true; # fails to build with recent versions of botan. https://github.com/das-labor/neopg/issues/98 }; } diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix new file mode 100644 index 0000000000000..22013352a38da --- /dev/null +++ b/pkgs/tools/security/nuclei/default.nix @@ -0,0 +1,36 @@ +{ buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "nuclei"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = "nuclei"; + rev = "v${version}"; + sha256 = "0xrvza86aczlnb11x58fiqch5g0q6gvpxwsi5dq3akfi95gk3a3x"; + }; + + vendorSha256 = "1v3ax8l1lgp2vs50gsa2fhdd6bvyfdlkd118akrqmwxahyyyqycv"; + + preBuild = '' + mv v2/* . + ''; + + meta = with stdenv.lib; { + description = "Tool for configurable targeted scanning"; + longDescription = '' + Nuclei is used to send requests across targets based on a template + leading to zero false positives and providing effective scanning + for known paths. Main use cases for nuclei are during initial + reconnaissance phase to quickly check for low hanging fruits or + CVEs across targets that are known and easily detectable. + ''; + homepage = "https://github.com/projectdiscovery/nuclei"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/onlykey-cli/default.nix b/pkgs/tools/security/onlykey-cli/default.nix new file mode 100644 index 0000000000000..b342f203b44c6 --- /dev/null +++ b/pkgs/tools/security/onlykey-cli/default.nix @@ -0,0 +1,24 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "onlykey-cli"; + version = "1.2.2"; + + src = python3Packages.fetchPypi { + inherit version; + pname = "onlykey"; + sha256 = "1qkbgab5xlg7bd0jfzf8k5ppb1zhib76r050fiaqi5wibrqrfwdi"; + }; + + # Requires having the physical onlykey (a usb security key) + doCheck = false; + propagatedBuildInputs = + with python3Packages; [ hidapi aenum six prompt_toolkit pynacl ecdsa cython ]; + + meta = with lib; { + description = "OnlyKey client and command-line tool"; + homepage = "https://github.com/trustcrypto/python-onlykey"; + license = licenses.mit; + maintainers = with maintainers; [ ranfdev ]; + }; +} diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index e8c4b1f541bd8..bd5e886637444 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -20,15 +20,15 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "0.5.0"; + version = "0.5.2"; src = fetchCrate { inherit version; crateName = pname; - sha256 = "0p37kwkp153mkns4bh7k7gnksk6c31214wlw3faf42daav32mmgw"; + sha256 = "1mxl71yz2iy5s6pbp33cwkfzzilkla4qqiskd6jsd5fdlrrwlxqm"; }; - cargoSha256 = "1vkgh0995xx0hr96mnzmdgd15gs6da7ynywqcjgcw5kr48bf1063"; + cargoSha256 = "19gznam64s17kha3accgjks5rmd9kpqqgxg3dfrk7fg5v4431007"; nativeBuildInputs = [ pkgconfig @@ -72,6 +72,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Unofficial command line client for Bitwarden"; homepage = "https://crates.io/crates/rbw"; + changelog = "https://git.tozt.net/rbw/plain/CHANGELOG.md?id=${version}"; license = licenses.mit; maintainers = with maintainers; [ albakham luc65r marsam ]; }; diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index aa2a12fc351e3..201b4c56f2b9e 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -23,16 +23,16 @@ assert pythonSupport -> pythonPackages != null; rustPlatform.buildRustPackage rec { pname = "sequoia"; - version = "0.20.0"; + version = "1.0.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia"; rev = "v${version}"; - sha256 = "sha256-br5GRzWprQTixNrE0WpNIB7Ayj5oEfyCg5JY4MnX5rA="; + sha256 = "0y80bl786m29ww3272qsl1ql0xc3pwd6iiqlkv3nmhnjsmygbn0d"; }; - cargoSha256 = "sha256-SpCdoLCtvU9jpG/ivB/+4KhRdKZxN3/+7P/RlR6n9/c="; + cargoSha256 = "03ngywa5z0c7qmdmhynk13xcivhg8gpivvpzg2gxp34gfr7j438l"; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index e5574be8ab941..f3c9990a3c742 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -1,19 +1,35 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ stdenv +, lib +, fetchFromGitHub +, buildGoModule +, pcsclite +, PCSC +, pkg-config +}: -buildGoPackage rec { +buildGoModule rec { pname = "step-ca"; - version = "0.13.3"; - - goPackagePath = "github.com/smallstep/certificates"; + version = "0.15.6"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = "1i42j7v5a5qqqb9ng8irblfyzykhyws0394q3zac290ymjijxbnq"; + sha256 = "0n26692ph4q4cmrqammfazmx1k9p2bydwqc57q4hz5ni6jd31zbz"; }; - goDeps = ./deps.nix; + vendorSha256 = "0w0phyqymcg2h2jjasxmkf4ryn4y1bqahcy94rs738cqr5ifyfbg"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = + lib.optional stdenv.isLinux (lib.getDev pcsclite) + ++ lib.optional stdenv.isDarwin PCSC; + + # Tests fail on darwin with + # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted [recovered] + # probably some sandboxing issue + doCheck = stdenv.isLinux; meta = with lib; { description = "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH"; diff --git a/pkgs/tools/security/step-ca/deps.nix b/pkgs/tools/security/step-ca/deps.nix deleted file mode 100644 index 07607b6f65d27..0000000000000 --- a/pkgs/tools/security/step-ca/deps.nix +++ /dev/null @@ -1,291 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/AndreasBriese/bbloom"; - fetch = { - type = "git"; - url = "https://github.com/AndreasBriese/bbloom"; - rev = "e2d15f34fcf99d5dbb871c820ec73f710fca9815"; - sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds"; - }; - } - { - goPackagePath = "github.com/chzyer/readline"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/readline"; - rev = "2972be24d48e78746da79ba8e24e8b488c9880de"; - sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; - }; - } - { - goPackagePath = "github.com/dgraph-io/badger"; - fetch = { - type = "git"; - url = "https://github.com/dgraph-io/badger"; - rev = "391b6d3b93e6014fe8c2971fcc0c1266e47dbbd9"; - sha256 = "13zyd6irxagwfv4azgmpk2qg8f80plhxrcjl8x89jzsjkl0a0pkx"; - }; - } - { - goPackagePath = "github.com/dgryski/go-farm"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-farm"; - rev = "6a90982ecee230ff6cba02d5bd386acc030be9d3"; - sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix"; - }; - } - { - goPackagePath = "github.com/go-chi/chi"; - fetch = { - type = "git"; - url = "https://github.com/go-chi/chi"; - rev = "0ebf7795c516423a110473652e9ba3a59a504863"; - sha256 = "18hwj6vni19ykp3bsmg9ggnl6y2hawym0vbsigdgx8craqbp7jb1"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "72cd26f257d44c1114970e19afddcd812016007e"; - sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "aa810b61a9c79d51363740d207bb46cf8e620ed5"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - { - goPackagePath = "github.com/juju/ansiterm"; - fetch = { - type = "git"; - url = "https://github.com/juju/ansiterm"; - rev = "720a0952cc2ac777afc295d9861263e2a4cf96a1"; - sha256 = "0n6j0y7xhashp8gdkdl0r7vlbkdrkymrzxn9hxrx522k2isggs7h"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "5c8c8bd35d3832f5d134ae1e1e375b69a4d25242"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - { - goPackagePath = "github.com/lunixbochs/vtclean"; - fetch = { - type = "git"; - url = "https://github.com/lunixbochs/vtclean"; - rev = "2d01aacdc34a083dca635ba869909f5fc0cd4f41"; - sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf"; - }; - } - { - goPackagePath = "github.com/manifoldco/promptui"; - fetch = { - type = "git"; - url = "https://github.com/manifoldco/promptui"; - rev = "157c96fb638a14d268b305cf2012582431fcc410"; - sha256 = "0zha48i5f529q4j1qycybdzza4l9706hijiqws36ikd5jzg8i7wz"; - }; - } - { - 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 = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/mmcloughlin/avo"; - fetch = { - type = "git"; - url = "https://github.com/mmcloughlin/avo"; - rev = "2e7d06bc7ada2979f17ccf8ebf486dba23b84fc7"; - sha256 = "0fna1hhg193zy428lkj24a8853g3qviqs2c9xi96mji6ldprna5d"; - }; - } - { - goPackagePath = "github.com/newrelic/go-agent"; - fetch = { - type = "git"; - url = "https://github.com/newrelic/go-agent"; - rev = "f5bce3387232559bcbe6a5f8227c4bf508dac1ba"; - sha256 = "1zbp1cqhxp0sz3faymam6h1f91r1gl8dnnjx7qg8r06bd5fbzllb"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/rs/xid"; - fetch = { - type = "git"; - url = "https://github.com/rs/xid"; - rev = "15d26544def341f036c5f8dca987a4cbe575032c"; - sha256 = "1vgw1dikqw273awcci6pzifs7shkl5ah4l88j1zjbnpgbiwzlx9j"; - }; - } - { - goPackagePath = "github.com/samfoo/ansi"; - fetch = { - type = "git"; - url = "https://github.com/samfoo/ansi"; - rev = "b6bd2ded7189ce35bc02233b554eb56a5146af73"; - sha256 = "0sw2d7c6l2ry34x0n4j37ydr8s7hxnax76yh6n35gb2g6f1h46sz"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "86672fcb3f950f35f2e675df2240550f2a50762f"; - sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "ad15b42461921f1fb3529b058c6786c6a45d5162"; - sha256 = "02xdfcp4f6dqvpavwf1vvr794qgz2fx8929paam7wnvcxy7ib606"; - }; - } - { - goPackagePath = "github.com/smallstep/assert"; - fetch = { - type = "git"; - url = "https://github.com/smallstep/assert"; - rev = "de77670473b5492f5d0bce155b5c01534c2d13f7"; - sha256 = "15z2b4qyylnwgq2pzlaxsdabqxh8dbna4ddprk9rzmsvnfkpds16"; - }; - } - { - goPackagePath = "github.com/smallstep/cli"; - fetch = { - type = "git"; - url = "https://github.com/smallstep/cli"; - rev = "eeecaac062cb548ee2ab7c7563bc3c2f2160f019"; - sha256 = "1khhd1vgwqb08vki1nh0k4i2yk6jjdqmnq4f8anqn125zsj7hvdk"; - }; - } - { - goPackagePath = "github.com/smallstep/nosql"; - fetch = { - type = "git"; - url = "https://github.com/smallstep/nosql"; - rev = "f80b3f432de0662f07ebd58fe52b0a119fe5dcd9"; - sha256 = "155blxdgaprl1py5g8p52gipp0ckz3k6v41hgsp83nay01yynafb"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "b67dcf995b6a7b7f14fad5fcb7cc5441b05e814b"; - sha256 = "0n5vq4nydlhb7w12jiwphvxqdy4jwpxc3zwlxyhf05lq1nxfb56h"; - }; - } - { - goPackagePath = "go.etcd.io/bbolt"; - fetch = { - type = "git"; - url = "https://github.com/etcd-io/bbolt"; - rev = "63597a96ec0ad9e6d43c3fc81e809909e0237461"; - sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "4d3f4d9ffa16a13f451c3b2999e9c49e9750bf06"; - sha256 = "0sbsgjm6wqa162ssrf1gnpv62ak5wjn1bn8v7sxwwfg8a93z1028"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "c44066c5c816ec500d459a2a324a753f78531ae0"; - sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "9b800f95dbbc54abff0acf7ee32d88ba4e328c89"; - sha256 = "07v3l7q7y59cwvw0mc85i39v7qjcc1jh4svwi789rmrqqm5nq7q6"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "3a10b9bf0a52df7e992a8c3eb712a86d3c896c75"; - sha256 = "19f3dijcc54jnd7458jab2dgpd0gzccmv2qympd9wi8cc8jpnhws"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "54a98f90d1c46b7731eb8fb305d2a321c30ef610"; - sha256 = "0l7mkdnwhidv8m686x432vmx8z5nqcrr9f46ddgvrxbh4wvyfcll"; - }; - } - { - goPackagePath = "gopkg.in/square/go-jose.v2"; - fetch = { - type = "git"; - url = "https://github.com/square/go-jose"; - rev = "730df5f748271903322feb182be83b43ebbbe27d"; - sha256 = "11r93g9xrcjqj7qvq8sbd5hy5rnbpmim0vdsp6rbav8gl7wimaa3"; - }; - } -] \ No newline at end of file diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index d696b560f6dc3..2b6ec57bbf2ba 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -1,19 +1,26 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +, fetchpatch +}: -buildGoPackage rec { +buildGoModule rec { pname = "step-cli"; - version = "0.13.3"; - - goPackagePath = "github.com/smallstep/cli"; + version = "0.15.3-22-g3ddc5aa"; + # 0.15.3 isn't enough, because we need https://github.com/smallstep/cli/pull/394 src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; - rev = "v${version}"; - sha256 = "0b5hk9a8yq1nyh8m1gmf28yiha95xwsc4dk321g84hvai7g47pbr"; + rev = "3ddc5aaafccb23ba9a20abfa70109a2923f298e3"; + sha256 = "1kd04hi764xa3f9p6aw6k9f6wa4y6xsmzby5jxvvkhim4w78brw0"; }; - goDeps = ./deps.nix; + preCheck = '' + # Tries to connect to smallstep.com + rm command/certificate/remote_test.go + ''; + vendorSha256 = "04hckq78g1p04b2q0rq4xw6d880hqhkabbx1pc3pf8r1m6jxwz10"; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; diff --git a/pkgs/tools/security/step-cli/deps.nix b/pkgs/tools/security/step-cli/deps.nix deleted file mode 100644 index bae1ba070a691..0000000000000 --- a/pkgs/tools/security/step-cli/deps.nix +++ /dev/null @@ -1,453 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/AndreasBriese/bbloom"; - fetch = { - type = "git"; - url = "https://github.com/AndreasBriese/bbloom"; - rev = "e2d15f34fcf99d5dbb871c820ec73f710fca9815"; - sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds"; - }; - } - { - goPackagePath = "github.com/ThomasRooney/gexpect"; - fetch = { - type = "git"; - url = "https://github.com/ThomasRooney/gexpect"; - rev = "5482f03509440585d13d8f648989e05903001842"; - sha256 = "04zan78ndabxlwsw2hdcqbz32435pw2s04ljza07jlxnxzjp4kws"; - }; - } - { - goPackagePath = "github.com/asaskevich/govalidator"; - fetch = { - type = "git"; - url = "https://github.com/asaskevich/govalidator"; - rev = "ccb8e960c48f04d6935e72476ae4a51028f9e22f"; - sha256 = "1sih4yb6fqmdp5g6594yyida0qm7dvvqcfvf8pgikydkxyqb8g0k"; - }; - } - { - goPackagePath = "github.com/boombuler/barcode"; - fetch = { - type = "git"; - url = "https://github.com/boombuler/barcode"; - rev = "3cfea5ab600ae37946be2b763b8ec2c1cf2d272d"; - sha256 = "1fzb8wz1ny2sc78g9rm0bcm80pgwvkm2k6lmim2sb4jgm1j3sajd"; - }; - } - { - goPackagePath = "github.com/chzyer/readline"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/readline"; - rev = "2972be24d48e78746da79ba8e24e8b488c9880de"; - sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; - }; - } - { - goPackagePath = "github.com/corpix/uarand"; - fetch = { - type = "git"; - url = "https://github.com/corpix/uarand"; - rev = "2b8494104d86337cdd41d0a49cbed8e4583c0ab4"; - sha256 = "06ml5m8l9wbr96gvyg6z1syawn797f8kmq74nhgry3vqpngyb6yn"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/dgraph-io/badger"; - fetch = { - type = "git"; - url = "https://github.com/dgraph-io/badger"; - rev = "391b6d3b93e6014fe8c2971fcc0c1266e47dbbd9"; - sha256 = "13zyd6irxagwfv4azgmpk2qg8f80plhxrcjl8x89jzsjkl0a0pkx"; - }; - } - { - goPackagePath = "github.com/dgryski/go-farm"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-farm"; - rev = "6a90982ecee230ff6cba02d5bd386acc030be9d3"; - sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix"; - }; - } - { - goPackagePath = "github.com/go-chi/chi"; - fetch = { - type = "git"; - url = "https://github.com/go-chi/chi"; - rev = "0ebf7795c516423a110473652e9ba3a59a504863"; - sha256 = "18hwj6vni19ykp3bsmg9ggnl6y2hawym0vbsigdgx8craqbp7jb1"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "72cd26f257d44c1114970e19afddcd812016007e"; - sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "b5d812f8a3706043e23a9cd5babf2e5423744d30"; - sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; - }; - } - { - goPackagePath = "github.com/google/certificate-transparency-go"; - fetch = { - type = "git"; - url = "https://github.com/google/certificate-transparency-go"; - rev = "3629d6846518309d22c16fee15d1007262a459d2"; - sha256 = "16vsq7dd2kbbk3vwlrhm3jrlg5kq16wf4iz6d1gnyc32s5fcy9d7"; - }; - } - { - goPackagePath = "github.com/icrowley/fake"; - fetch = { - type = "git"; - url = "https://github.com/icrowley/fake"; - rev = "4178557ae428460c3780a381c824a1f3aceb6325"; - sha256 = "1mv4bxfphaqbvacy49v4lf4gf2nmadzpmjq0jbdx93wi5bnkc977"; - }; - } - { - goPackagePath = "github.com/juju/ansiterm"; - fetch = { - type = "git"; - url = "https://github.com/juju/ansiterm"; - rev = "720a0952cc2ac777afc295d9861263e2a4cf96a1"; - sha256 = "0n6j0y7xhashp8gdkdl0r7vlbkdrkymrzxn9hxrx522k2isggs7h"; - }; - } - { - goPackagePath = "github.com/kballard/go-shellquote"; - fetch = { - type = "git"; - url = "https://github.com/kballard/go-shellquote"; - rev = "95032a82bc518f77982ea72343cc1ade730072f0"; - sha256 = "1rspvmnsikdq95jmx3dykxd4k1rmgl98ryjrysvl0cf18hl1vq80"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "5c8c8bd35d3832f5d134ae1e1e375b69a4d25242"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "db8e3cd836b82e82e0a9c8edc6896967dd31374f"; - sha256 = "0knzlvndfgjm2k23vhp2xj1cv3fm31vbg5b20gdl1vnxk7rh549h"; - }; - } - { - goPackagePath = "github.com/lunixbochs/vtclean"; - fetch = { - type = "git"; - url = "https://github.com/lunixbochs/vtclean"; - rev = "2d01aacdc34a083dca635ba869909f5fc0cd4f41"; - sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf"; - }; - } - { - goPackagePath = "github.com/manifoldco/promptui"; - fetch = { - type = "git"; - url = "https://github.com/manifoldco/promptui"; - rev = "157c96fb638a14d268b305cf2012582431fcc410"; - sha256 = "0zha48i5f529q4j1qycybdzza4l9706hijiqws36ikd5jzg8i7wz"; - }; - } - { - 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 = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/mmcloughlin/avo"; - fetch = { - type = "git"; - url = "https://github.com/mmcloughlin/avo"; - rev = "2e7d06bc7ada2979f17ccf8ebf486dba23b84fc7"; - sha256 = "0fna1hhg193zy428lkj24a8853g3qviqs2c9xi96mji6ldprna5d"; - }; - } - { - goPackagePath = "github.com/newrelic/go-agent"; - fetch = { - type = "git"; - url = "https://github.com/newrelic/go-agent"; - rev = "f5bce3387232559bcbe6a5f8227c4bf508dac1ba"; - sha256 = "1zbp1cqhxp0sz3faymam6h1f91r1gl8dnnjx7qg8r06bd5fbzllb"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/pquerna/otp"; - fetch = { - type = "git"; - url = "https://github.com/pquerna/otp"; - rev = "b7b89250c468c06871d3837bee02e2d5c155ae19"; - sha256 = "0gsl9rh8awira21z6cj26c6swasskx03z66q72yjc1mpbvyg6han"; - }; - } - { - goPackagePath = "github.com/rs/xid"; - fetch = { - type = "git"; - url = "https://github.com/rs/xid"; - rev = "15d26544def341f036c5f8dca987a4cbe575032c"; - sha256 = "1vgw1dikqw273awcci6pzifs7shkl5ah4l88j1zjbnpgbiwzlx9j"; - }; - } - { - goPackagePath = "github.com/samfoo/ansi"; - fetch = { - type = "git"; - url = "https://github.com/samfoo/ansi"; - rev = "b6bd2ded7189ce35bc02233b554eb56a5146af73"; - sha256 = "0sw2d7c6l2ry34x0n4j37ydr8s7hxnax76yh6n35gb2g6f1h46sz"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "86672fcb3f950f35f2e675df2240550f2a50762f"; - sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "ad15b42461921f1fb3529b058c6786c6a45d5162"; - sha256 = "02xdfcp4f6dqvpavwf1vvr794qgz2fx8929paam7wnvcxy7ib606"; - }; - } - { - goPackagePath = "github.com/smallstep/assert"; - fetch = { - type = "git"; - url = "https://github.com/smallstep/assert"; - rev = "de77670473b5492f5d0bce155b5c01534c2d13f7"; - sha256 = "15z2b4qyylnwgq2pzlaxsdabqxh8dbna4ddprk9rzmsvnfkpds16"; - }; - } - { - goPackagePath = "github.com/smallstep/certificates"; - fetch = { - type = "git"; - url = "https://github.com/smallstep/certificates"; - rev = "effb490d276f33b8cdab661df8b57a8ded67e082"; - sha256 = "1i76bbm4rbpv4cw2ln36v0x74jjkss6j8pdh49hfvb75j2n32790"; - }; - } - { - goPackagePath = "github.com/smallstep/certinfo"; - fetch = { - type = "git"; - url = "https://github.com/smallstep/certinfo"; - rev = "78e21b44234ef6ddeb58f5e8aad2ed09975b694a"; - sha256 = "0zrxql9173vzn7zirv4299j0vw2mzwknivrg8rzhdbkhvbfiql9q"; - }; - } - { - goPackagePath = "github.com/smallstep/nosql"; - fetch = { - type = "git"; - url = "https://github.com/smallstep/nosql"; - rev = "a0934e12468769d8cbede3ed316c47a4b88de4ca"; - sha256 = "08bg0sgrhkzflyl0ybi8v2vmk8bfk5pmcyfrizpxssyql7k27fam"; - }; - } - { - goPackagePath = "github.com/smallstep/truststore"; - fetch = { - type = "git"; - url = "https://github.com/smallstep/truststore"; - rev = "e16045d94a61ca04b60d5d246da3117e7eeb1ecf"; - sha256 = "15cv3dkn2npf6rwhkb575sdq089rf70rha8wrym4ygc8rjbgwbab"; - }; - } - { - goPackagePath = "github.com/smallstep/zcrypto"; - fetch = { - type = "git"; - url = "https://github.com/smallstep/zcrypto"; - rev = "6bab21fcaafc3d150cf793b6d5f25fe32f49c80e"; - sha256 = "129az7k556lmnhh14ayrwzrp1y205zdgwk3rj1xcmgisx5irliqp"; - }; - } - { - goPackagePath = "github.com/smallstep/zlint"; - fetch = { - type = "git"; - url = "https://github.com/smallstep/zlint"; - rev = "d84eaafe274f9dc1f811ebfbb073e18c466e2a44"; - sha256 = "1xm7b1wvbify20vk9f3kmgmi5mnj5x2z3czc0r4zylcqcwwjkfd6"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "b67dcf995b6a7b7f14fad5fcb7cc5441b05e814b"; - sha256 = "0n5vq4nydlhb7w12jiwphvxqdy4jwpxc3zwlxyhf05lq1nxfb56h"; - }; - } - { - goPackagePath = "github.com/weppos/publicsuffix-go"; - fetch = { - type = "git"; - url = "https://github.com/weppos/publicsuffix-go"; - rev = "386050f8211b04c965721c3591e7d96650a1ea86"; - sha256 = "17nvc0m0azm418w4mcyk7r1qcik0099vjpn455ia0lxhbqbl701b"; - }; - } - { - goPackagePath = "go.etcd.io/bbolt"; - fetch = { - type = "git"; - url = "https://github.com/etcd-io/bbolt"; - rev = "63597a96ec0ad9e6d43c3fc81e809909e0237461"; - sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "4d3f4d9ffa16a13f451c3b2999e9c49e9750bf06"; - sha256 = "0sbsgjm6wqa162ssrf1gnpv62ak5wjn1bn8v7sxwwfg8a93z1028"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "c44066c5c816ec500d459a2a324a753f78531ae0"; - sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "9b800f95dbbc54abff0acf7ee32d88ba4e328c89"; - sha256 = "07v3l7q7y59cwvw0mc85i39v7qjcc1jh4svwi789rmrqqm5nq7q6"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "3a10b9bf0a52df7e992a8c3eb712a86d3c896c75"; - sha256 = "19f3dijcc54jnd7458jab2dgpd0gzccmv2qympd9wi8cc8jpnhws"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "54a98f90d1c46b7731eb8fb305d2a321c30ef610"; - sha256 = "0l7mkdnwhidv8m686x432vmx8z5nqcrr9f46ddgvrxbh4wvyfcll"; - }; - } - { - goPackagePath = "gopkg.in/square/go-jose.v2"; - fetch = { - type = "git"; - url = "https://github.com/square/go-jose"; - rev = "730df5f748271903322feb182be83b43ebbbe27d"; - sha256 = "11r93g9xrcjqj7qvq8sbd5hy5rnbpmim0vdsp6rbav8gl7wimaa3"; - }; - } - { - goPackagePath = "howett.net/plist"; - fetch = { - type = "git"; - url = "https://gitlab.howett.net/go/plist.git"; - rev = "591f970eefbbeb04d7b37f334a0c4c3256e32876"; - sha256 = "1gr74rf6m8bgayf6mxcfaxb3cc49ldlhydzqfafx7di5nds5hxk9"; - }; - } -] diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index ae29eeafd006b..776823a6a280d 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.4"; + version = "1.9.4p2"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - sha256 = "1w03257akspgkkl757vmpq3p30sb2n6y61hll038mw9sqwnbv4cb"; + sha256 = "0r0g8z289ipw0zpkhmm33cpfm42j01jds2q1wilhh3flg7xg2jn3"; }; prePatch = '' diff --git a/pkgs/tools/security/teler/default.nix b/pkgs/tools/security/teler/default.nix new file mode 100644 index 0000000000000..3786637585916 --- /dev/null +++ b/pkgs/tools/security/teler/default.nix @@ -0,0 +1,33 @@ +{ buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "teler"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "kitabisa"; + repo = "teler"; + rev = "v${version}"; + sha256 = "07pfqgms5cj4y6zm984qjmmw1c8j9yjbgrp2spi9vzk96s3k3qn3"; + }; + + vendorSha256 = "06szi2jw3nayd7pljjlww2gsllgnfg8scnjmc6qv5xl6gf797kdz"; + + # test require internet access + doCheck = false; + + meta = with stdenv.lib; { + description = "Real-time HTTP Intrusion Detection"; + longDescription = '' + teler is an real-time intrusion detection and threat alert + based on web log that runs in a terminal with resources that + we collect and provide by the community. + ''; + homepage = "https://github.com/kitabisa/teler"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index c7835c5989cc6..1a975aef3932e 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -2,20 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.5.4"; + version = "0.5.6"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "1rpwgwgl05n0s89mhyvabzvsa33ibkd1msyrwfll4wbcbsn0ish7"; + sha256 = "sha256-88uEEsb+coX8PTKrem+0t5AkamCmqJsFYsENFTZSsys="; }; + prePatch = '' + rm .cargo/config.toml + ''; + nativeBuildInputs = [ installShellFiles ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; - cargoSha256 = "0ykl66gs7k49vfjpw5i8xsbc1blmqm79vrsci2irsl5w642lbig5"; + cargoSha256 = "sha256-qnh4Tl6JRgxBJbu+t9IJX/XChIR15rTRLvsl+/ZvPxY="; doCheck = false; diff --git a/pkgs/tools/system/colorls/Gemfile.lock b/pkgs/tools/system/colorls/Gemfile.lock index d138a167ce740..e9cd8cbf766d4 100644 --- a/pkgs/tools/system/colorls/Gemfile.lock +++ b/pkgs/tools/system/colorls/Gemfile.lock @@ -2,14 +2,16 @@ GEM remote: https://rubygems.org/ specs: clocale (0.0.4) - colorls (1.4.2) + colorls (1.4.3) clocale (~> 0) filesize (~> 0) manpages (~> 0) rainbow (>= 2.2, < 4.0) + unicode-display_width (~> 1.7) filesize (0.2.0) manpages (0.6.1) rainbow (3.0.0) + unicode-display_width (1.7.0) PLATFORMS ruby diff --git a/pkgs/tools/system/colorls/gemset.nix b/pkgs/tools/system/colorls/gemset.nix index 2e4a26ff91828..850aae35684b6 100644 --- a/pkgs/tools/system/colorls/gemset.nix +++ b/pkgs/tools/system/colorls/gemset.nix @@ -10,15 +10,15 @@ version = "0.0.4"; }; colorls = { - dependencies = ["clocale" "filesize" "manpages" "rainbow"]; + dependencies = ["clocale" "filesize" "manpages" "rainbow" "unicode-display_width"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sw377wklld5zn1la0smxc2bg4rph2xf9d0h3zmxhmds06lb92db"; + sha256 = "1w9d99qzgxw8wwa4z1vkdnr70fppx2g9shma6dz3ihjhajj2xvmq"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.3"; }; filesize = { groups = ["default"]; @@ -50,4 +50,14 @@ }; version = "3.0.0"; }; + unicode-display_width = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + type = "gem"; + }; + version = "1.7.0"; + }; } \ No newline at end of file diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/tools/system/daemon/default.nix index 29f976998d53c..c419824f96993 100644 --- a/pkgs/tools/system/daemon/default.nix +++ b/pkgs/tools/system/daemon/default.nix @@ -9,7 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0b17zzl7bqnkn7a4pr3l6fxqfmxfld7izphrab5nvhc4wzng4spn"; }; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "PREFIX=$(out)" + "CC=${stdenv.cc.targetPrefix}cc" + ]; + buildInputs = [ perl ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index a36cb905d2556..bf811942c3e61 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "htop"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "htop-dev"; repo = pname; rev = version; - sha256 = "0ylig6g2w4r3qfb16cf922iriqyn64frkzpk87vpga16kclvf08y"; + sha256 = "1fckfv96vzqjs3lzy0cgwsqv5vh1sxca3fhvgskmnkvr5bq6cia9"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index e5747a09f9c50..14b14fa9ffd18 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -22,13 +22,13 @@ let ++ recommendedDisplayInformationPrograms; in stdenv.mkDerivation rec { pname = "inxi"; - version = "3.1.09-1"; + version = "3.2.01-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "0m6s8kxjppy3jm39is5i1lbrah29cw86rq0vamvx46izbdyf84y5"; + sha256 = "15bakrv3jzj5h88c3bd0cfhh6hb8b4hm79924k1ygn29sqzgyw65"; }; buildInputs = [ perl makeWrapper ]; diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 1ed1d91351653..cd4eef89520be 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "rocm-smi"; - version = "3.10.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/tools/text/chroma/default.nix b/pkgs/tools/text/chroma/default.nix index 438681e1728f2..390793ffaf1c2 100644 --- a/pkgs/tools/text/chroma/default.nix +++ b/pkgs/tools/text/chroma/default.nix @@ -1,16 +1,32 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, git }: buildGoModule rec { pname = "chroma"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "alecthomas"; - repo = "chroma"; + repo = pname; rev = "v${version}"; - sha256 = "1gwwfn26aipzzvyy466gi6r54ypfy3ylnbi8c4xwch9pkgw16w98"; + sha256 = "0vzxd0jvjaakwjvkkkjppakjb00z44k7gb5ng1i4924agh24n5ka"; + leaveDotGit = true; + fetchSubmodules = true; }; + nativeBuildInputs = [ git ]; + + # populate values otherwise taken care of by goreleaser + # https://github.com/alecthomas/chroma/issues/435 + postPatch = '' + commit="$(git rev-parse HEAD)" + date=$(git show -s --format=%aI "$commit") + + substituteInPlace cmd/chroma/main.go \ + --replace 'version = "?"' 'version = "${version}"' \ + --replace 'commit = "?"' "commit = \"$commit\"" \ + --replace 'date = "?"' "date = \"$date\"" + ''; + vendorSha256 = "16cnc4scgkx8jan81ymha2q1kidm6hzsnip5mmgbxpqcc2h7hv9m"; subPackages = [ "cmd/chroma" ]; diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index fc0ec487ad50b..30029d2d4e979 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ edwtjo ]; + platforms = jre.meta.platforms; description = "A proofreading program for English, French German, Polish, and more"; }; } diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 7bd8a74f4587b..c69c6fef8cbd4 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -1,4 +1,5 @@ { stdenv +, nixosTests , fetchFromGitHub , rustPlatform , asciidoctor @@ -34,6 +35,8 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh complete/_rg ''; + passthru.tests = { inherit (nixosTests) ripgrep; }; + meta = with stdenv.lib; { description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; homepage = "https://github.com/BurntSushi/ripgrep"; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 353d85931ade3..84dc21aba3e95 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.0.6"; + version = "3.1.0"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "1s8glpk7li45rcf2xi21qv65dldl8sd3mmalf54pbzfcjri5fwz6"; + sha256 = "08pq759f2vvdbig64y3k9kicvgr2d5x8ara7b182dcm3slbpib3l"; }; buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ]; diff --git a/pkgs/tools/typesetting/bibclean/default.nix b/pkgs/tools/typesetting/bibclean/default.nix index d0e2c79c0bcef..c95c6921a4e0d 100644 --- a/pkgs/tools/typesetting/bibclean/default.nix +++ b/pkgs/tools/typesetting/bibclean/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { description = "Prettyprint and syntax check BibTeX and Scribe bibliography data base files"; homepage = "http://ftp.math.utah.edu/pub/bibclean"; license = licenses.gpl2; + platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 017066a2c22b1..ecd25bf8e8338 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.7.4"; + version = "0.7.5"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "2iw5x3lf5knnscp0ifgk50yj48p54cbd34h94qrxa9vdybg2nnipklrqmmqblf6l7qph98h7jvlyr99m5qlrki9lvjr1jcgbgp31pn0"; + sha512 = "1wfbrydbk0f0blhg5my3m5gw8bspwh3rdg4w4mcalnrwpypzd4zrggc4aj3zm72c5jikx6pnjb2k9w1s075k84f6q8p8chlzb3s4qd2"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 891495c46cac2..0625fe16090a3 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -36,7 +36,7 @@ let mkUniqueOutPaths = pkgs: uniqueStrings (map (p: p.outPath) (builtins.filter lib.isDerivation pkgs)); -in buildEnv { +in (buildEnv { name = "texlive-${extraName}-${bin.texliveYear}"; extraPrefix = "/share/texmf"; @@ -271,6 +271,6 @@ in buildEnv { '' + bin.cleanBrokenLinks ; -} +}).overrideAttrs (_: { allowSubstitutes = true; }) # TODO: make TeX fonts visible by fontconfig: it should be enough to install an appropriate file # similarly, deal with xe(la)tex font visibility? diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3d4ce4b453637..6e5da1bf34ec1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -46,12 +46,22 @@ mapAliases ({ ammonite-repl = ammonite; # added 2017-05-02 amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09 antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06 + apacheKafka_0_9 = throw "kafka 0.9 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_0_10 = throw "kafka 0.10 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_0_11 = throw "kafka 0.11 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_1_0 = throw "kafka 1.0 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_1_1 = throw "kafka 1.1 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_2_0 = throw "kafka 2.0 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_2_1 = throw "kafka 2.1 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_2_2 = throw "kafka 2.2 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 + apacheKafka_2_3 = throw "kafka 2.3 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21 arduino_core = arduino-core; # added 2015-02-04 arora = throw "arora has been removed."; # added 2020-09-09 asciidocFull = asciidoc-full; # added 2014-06-22 asterisk_15 = throw "asterisk_15: Asterisk 15 is end of life and has been removed."; # added 2020-10-07 at_spi2_atk = at-spi2-atk; # added 2018-02-25 at_spi2_core = at-spi2-core; # added 2018-02-25 + aucdtect = throw "aucdtect: Upstream no longer provides download urls."; # added 2020-12-26 avldrums-lv2 = x42-avldrums; # added 2020-03-29 bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 @@ -88,6 +98,7 @@ mapAliases ({ clangAnalyzer = clang-analyzer; # added 2015-02-20 clawsMail = claws-mail; # added 2016-04-29 clutter_gtk = clutter-gtk; # added 2018-02-25 + codimd = hedgedoc; # added 2020-11-29 compton = picom; # added 2019-12-02 compton-git = compton; # added 2019-05-20 conntrack_tools = conntrack-tools; # added 2018-05 @@ -483,12 +494,14 @@ mapAliases ({ pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 + qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # added 2020-12-02 quake3game = ioquake3; # added 2016-01-14 qvim = throw "qvim has been removed."; # added 2020-08-31 qwt6 = libsForQt5.qwt; # added 2015-12-19 qtcurve = libsForQt5.qtcurve; # added 2020-11-07 qtpfsgui = throw "qtpfsgui is now luminanceHDR"; # added 2019-06-26 quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09 + raspberrypi-tools = throw "raspberrypi-tools has been removed in favor of identical 'libraspberrypi'"; # added 2020-12-24 rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 @@ -560,6 +573,7 @@ mapAliases ({ smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2020-11-04 slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11 slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11 + spectral = neochat; # added 2020-12-27 sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; # added 2020-02-10 @@ -652,6 +666,7 @@ mapAliases ({ ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 unicorn-emu = unicorn; # added 2020-10-29 + unifiStable = unifi6; # added 2020-12-28 usb_modeswitch = usb-modeswitch; # added 2016-05-10 usbguard-nox = usbguard; # added 2019-09-04 utillinux = util-linux; # added 2020-11-24 @@ -700,6 +715,10 @@ mapAliases ({ gnome_user_docs = gnome-user-docs; # added 2019-11-20 # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell spidermonkey = spidermonkey_78; # added 2020-10-09 + libtorrentRasterbar = libtorrent-rasterbar; # added 2020-12-20 + libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # added 2020-12-20 + libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # added 2020-12-20 + libtorrentRasterbar-1_1_x = libtorrent-rasterbar-1_1_x; # added 2020-12-20 # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 # branch-off @@ -823,7 +842,7 @@ mapAliases ({ kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm - systemsettings user-manager xdg-desktop-portal-kde + systemsettings xdg-desktop-portal-kde ; inherit (plasma5.thirdParty) plasma-applet-caffeine-plus diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b049b1e1ddb8..c0242b005a15a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -222,6 +222,8 @@ in ptags = callPackage ../development/tools/misc/ptags { }; + ptouch-print = callPackage ../misc/ptouch-print { }; + demoit = callPackage ../servers/demoit { }; deviceTree = callPackage ../os-specific/linux/device-tree {}; @@ -1305,6 +1307,8 @@ in gopass = callPackage ../tools/security/gopass { }; + gospider = callPackage ../tools/security/gospider { }; + browserpass = callPackage ../tools/security/browserpass { }; passff-host = callPackage ../tools/security/passff-host { }; @@ -1347,6 +1351,8 @@ in wiimms-iso-tools = callPackage ../tools/filesystems/wiimms-iso-tools { }; + waypoint = callPackage ../applications/networking/cluster/waypoint { }; + xcodeenv = callPackage ../development/mobile/xcodeenv { }; ssh-agents = callPackage ../tools/networking/ssh-agents { }; @@ -1747,6 +1753,8 @@ in gflags = null; # only required for examples/tests }; + craftos-pc = callPackage ../misc/emulators/craftos-pc { }; + gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; @@ -1855,6 +1863,8 @@ in cpulimit = callPackage ../tools/misc/cpulimit { }; + code-minimap = callPackage ../tools/misc/code-minimap { }; + codesearch = callPackage ../tools/text/codesearch { }; codec2 = callPackage ../development/libraries/codec2 { }; @@ -1880,6 +1890,10 @@ in cppclean = callPackage ../development/tools/cppclean {}; + credhub-cli = callPackage ../tools/admin/credhub-cli { + buildGoModule = buildGo114Module; + }; + crex = callPackage ../tools/misc/crex { }; cri-tools = callPackage ../tools/virtualization/cri-tools {}; @@ -2009,6 +2023,8 @@ in dlx = callPackage ../misc/emulators/dlx { }; + dgen-sdl = callPackage ../misc/emulators/dgen-sdl { }; + doitlive = callPackage ../tools/misc/doitlive { }; dokuwiki = callPackage ../servers/web-apps/dokuwiki { }; @@ -2601,7 +2617,9 @@ in statserial = callPackage ../tools/misc/statserial { }; - step-ca = callPackage ../tools/security/step-ca { }; + step-ca = callPackage ../tools/security/step-ca { + inherit (darwin.apple_sdk.frameworks) PCSC; + }; step-cli = callPackage ../tools/security/step-cli { }; @@ -2957,9 +2975,7 @@ in cmt = callPackage ../applications/audio/cmt {}; - codimd = callPackage ../servers/web-apps/codimd { - nodejs = nodejs-12_x; - }; + hedgedoc = callPackage ../servers/web-apps/hedgedoc { }; colord = callPackage ../tools/misc/colord { }; @@ -3329,13 +3345,13 @@ in ddrutility = callPackage ../tools/system/ddrutility { }; - deluge-2_x = callPackage ../applications/networking/p2p/deluge/2 { + deluge-2_x = callPackage ../applications/networking/p2p/deluge { pythonPackages = python3Packages; - libtorrentRasterbar = libtorrentRasterbar.override { python = python3; }; + libtorrent-rasterbar = libtorrent-rasterbar-1_2_x.override { python = python3; }; }; - deluge-1_x = callPackage ../applications/networking/p2p/deluge/1 { + deluge-1_x = callPackage ../applications/networking/p2p/deluge/1.nix { pythonPackages = python2Packages; - libtorrentRasterbar = libtorrentRasterbar-1_1_x; + libtorrent-rasterbar = libtorrent-rasterbar-1_1_x; }; deluge = deluge-2_x; @@ -3367,6 +3383,8 @@ in dnstop = callPackage ../tools/networking/dnstop { }; + dnsx = callPackage ../tools/security/dnsx { }; + dhcp = callPackage ../tools/networking/dhcp { }; dhcpdump = callPackage ../tools/networking/dhcpdump { }; @@ -3883,6 +3901,8 @@ in feedreader = callPackage ../applications/networking/feedreaders/feedreader {}; + feeds = callPackage ../applications/networking/feedreaders/feeds {}; + fend = callPackage ../tools/misc/fend { }; ferm = callPackage ../tools/networking/ferm { }; @@ -3981,6 +4001,8 @@ in feedgnuplot = callPackage ../tools/graphics/feedgnuplot { }; + fbcat = callPackage ../tools/misc/fbcat { }; + fbv = callPackage ../tools/graphics/fbv { }; fbvnc = callPackage ../tools/admin/fbvnc {}; @@ -4131,6 +4153,8 @@ in garmintools = callPackage ../development/libraries/garmintools {}; + gau = callPackage ../tools/security/gau { }; + gauge = callPackage ../development/tools/gauge { }; gawk = callPackage ../tools/text/gawk { @@ -4736,6 +4760,8 @@ in httptunnel = callPackage ../tools/networking/httptunnel { }; + httpx = callPackage ../tools/security/httpx { }; + hubicfuse = callPackage ../tools/filesystems/hubicfuse { }; humanfriendly = with python3Packages; toPythonApplication humanfriendly; @@ -4773,6 +4799,8 @@ in icecast = callPackage ../servers/icecast { }; + icemon = libsForQt5.callPackage ../applications/networking/icemon { }; + icepeak = haskell.lib.justStaticExecutables haskellPackages.icepeak; iceshelf = callPackage ../tools/backup/iceshelf { }; @@ -5085,6 +5113,8 @@ in keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; + keystore-explorer = callPackage ../applications/misc/keystore-explorer { }; + kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { }; kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix { enableUnfree = false; @@ -5132,7 +5162,7 @@ in ksmoothdock = libsForQt514.callPackage ../applications/misc/ksmoothdock { }; - kstars = libsForQt514.callPackage ../applications/science/astronomy/kstars { }; + kstars = libsForQt5.callPackage ../applications/science/astronomy/kstars { }; kytea = callPackage ../tools/text/kytea { }; @@ -5168,6 +5198,8 @@ in libcryptui = callPackage ../development/libraries/libcryptui { }; + libsmartcols = callPackage ../development/libraries/libsmartcols { }; + libsmi = callPackage ../development/libraries/libsmi { }; libgen-cli = callPackage ../tools/misc/libgen-cli { }; @@ -5224,6 +5256,8 @@ in lvmsync = callPackage ../tools/backup/lvmsync { }; + kapp = callPackage ../tools/networking/kapp {}; + kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { }; kippo = callPackage ../servers/kippo { }; @@ -5266,7 +5300,7 @@ in mdcat = callPackage ../tools/text/mdcat { inherit (darwin.apple_sdk.frameworks) Security; - inherit (pythonPackages) ansi2html; + inherit (python3Packages) ansi2html; }; medfile = callPackage ../development/libraries/medfile { }; @@ -5311,6 +5345,8 @@ in mxisd = callPackage ../servers/mxisd { }; + naabu = callPackage ../tools/security/naabu { }; + nagstamon = callPackage ../tools/misc/nagstamon { pythonPackages = python3Packages; }; @@ -5731,6 +5767,8 @@ in mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; + microdnf = callPackage ../tools/package-management/microdnf { }; + microserver = callPackage ../servers/microserver { }; midisheetmusic = callPackage ../applications/audio/midisheetmusic { }; @@ -5921,6 +5959,8 @@ in neo-cowsay = callPackage ../tools/misc/neo-cowsay { }; + neochat = libsForQt5.callPackage ../applications/networking/instant-messengers/neochat { }; + neofetch = callPackage ../tools/misc/neofetch { }; nerdfonts = callPackage ../data/fonts/nerdfonts { }; @@ -6044,6 +6084,9 @@ in nomad_0_12 = callPackage ../applications/networking/cluster/nomad/0.12.nix { buildGoPackage = buildGo114Package; }; + nomad_1_0 = callPackage ../applications/networking/cluster/nomad/1.0.nix { + buildGoPackage = buildGo115Package; + }; notable = callPackage ../applications/misc/notable { }; @@ -6155,6 +6198,8 @@ in nssmdns = callPackage ../tools/networking/nss-mdns { }; + nvimpager = callPackage ../tools/misc/nvimpager { }; + nwdiag = with python3Packages; toPythonApplication nwdiag; nxdomain = python3.pkgs.callPackage ../tools/networking/nxdomain { }; @@ -6171,6 +6216,8 @@ in oathToolkit = callPackage ../tools/security/oath-toolkit { }; + oatpp = callPackage ../development/libraries/oatpp { }; + obex_data_server = callPackage ../tools/bluetooth/obex-data-server { }; obexd = callPackage ../tools/bluetooth/obexd { }; @@ -6224,6 +6271,8 @@ in onioncircuits = callPackage ../tools/security/onioncircuits { }; + onlykey-cli = callPackage ../tools/security/onlykey-cli { }; + openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { }; openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { }; @@ -6408,6 +6457,8 @@ in papertrail = callPackage ../tools/text/papertrail { }; + pappl = callPackage ../applications/printing/pappl { }; + par2cmdline = callPackage ../tools/networking/par2cmdline { }; parallel = callPackage ../tools/misc/parallel { }; @@ -6588,6 +6639,8 @@ in graphviz = graphviz_2_32; }; + plantuml-server = callPackage ../tools/misc/plantuml-server { }; + plan9port = callPackage ../tools/system/plan9port { }; platformioPackages = dontRecurseIntoAttrs (callPackage ../development/arduino/platformio { }); @@ -6702,6 +6755,8 @@ in proxychains = callPackage ../tools/networking/proxychains { }; + proxify = callPackage ../tools/networking/proxify { }; + proxytunnel = callPackage ../tools/misc/proxytunnel { openssl = openssl_1_0_2; }; @@ -6834,7 +6889,7 @@ in qshowdiff = callPackage ../tools/text/qshowdiff { }; - qr-filetransfer = callPackage ../tools/networking/qr-filetransfer { }; + qrcp = callPackage ../tools/networking/qrcp { }; qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; @@ -6906,6 +6961,8 @@ in rep = callPackage ../development/tools/rep { }; + reicast = callPackage ../misc/emulators/reicast { }; + reredirect = callPackage ../tools/misc/reredirect { }; retext = libsForQt5.callPackage ../applications/editors/retext { }; @@ -6923,6 +6980,8 @@ in rtptools = callPackage ../tools/networking/rtptools { }; + rtss = callPackage ../development/tools/misc/rtss { }; + reaverwps = callPackage ../tools/networking/reaver-wps {}; reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x {}; @@ -7662,6 +7721,8 @@ in pythonPackages = python3Packages; }; + teler = callPackage ../tools/security/teler { }; + termius = callPackage ../applications/networking/termius { }; termplay = callPackage ../tools/misc/termplay { }; @@ -7874,6 +7935,8 @@ in tty-clock = callPackage ../tools/misc/tty-clock { }; + tty-share = callPackage ../applications/misc/tty-share { }; + ttyplot = callPackage ../tools/misc/ttyplot { }; ttyrec = callPackage ../tools/misc/ttyrec { }; @@ -8296,6 +8359,8 @@ in xbrightness = callPackage ../tools/X11/xbrightness { }; + xdg-launch = callPackage ../applications/misc/xdg-launch { }; + xkbvalidate = callPackage ../tools/X11/xkbvalidate { }; xfstests = callPackage ../tools/misc/xfstests { }; @@ -8667,8 +8732,8 @@ in any-nix-shell = callPackage ../shells/any-nix-shell { }; bash = lowPrio (callPackage ../shells/bash/4.4.nix { }); - bash_5 = lowPrio (callPackage ../shells/bash/5.0.nix { }); - bashInteractive_5 = lowPrio (callPackage ../shells/bash/5.0.nix { + bash_5 = lowPrio (callPackage ../shells/bash/5.1.nix { }); + bashInteractive_5 = lowPrio (callPackage ../shells/bash/5.1.nix { interactive = true; withDocs = true; }); @@ -8697,7 +8762,9 @@ in fish-foreign-env = callPackage ../shells/fish/fish-foreign-env { }; - ion = callPackage ../shells/ion { }; + ion = callPackage ../shells/ion { + inherit (darwin) Security; + }; jush = callPackage ../shells/jush { }; @@ -8928,7 +8995,10 @@ in llvmPackages = llvmPackages_latest; }; - clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { }; + clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { + llvmPackages = llvmPackages_latest; + inherit (llvmPackages_latest) clang; + }; #Use this instead of stdenv to build with clang clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv; @@ -8981,8 +9051,9 @@ in crystal_0_33 crystal_0_34 crystal_0_35 - crystal - crystal2nix; + crystal; + + crystal2nix = callPackage ../development/compilers/crystal2nix { }; icr = callPackage ../development/tools/icr { }; @@ -9018,6 +9089,8 @@ in fasmg = callPackage ../development/compilers/fasmg { }; + flasm = callPackage ../development/compilers/flasm { }; + flyctl = callPackage ../development/web/flyctl { }; flutterPackages = @@ -9404,7 +9477,7 @@ in # Please update doc/languages-frameworks/haskell.section.md, “Our # current default compiler is”, if you bump this: - haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8102; + haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8103; inherit (haskellPackages) ghc; @@ -9722,7 +9795,6 @@ in knightos-kimg = callPackage ../development/tools/knightos/kimg { asciidoc = asciidoc-full; - imagemagick = imagemagick7Big; }; knightos-kpack = callPackage ../development/tools/knightos/kpack { }; @@ -10038,11 +10110,9 @@ in # So this commit doesn't remove the 1.45.2 release. rust_1_45 = callPackage ../development/compilers/rust/1_45.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_10; }; rust_1_48 = callPackage ../development/compilers/rust/1_48.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_11; }; rust = rust_1_48; @@ -10056,7 +10126,6 @@ in buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; - buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }); cratesIO = callPackage ../build-support/rust/crates-io.nix { }; cargo-web = callPackage ../development/tools/cargo-web { @@ -10496,7 +10565,7 @@ in ### LUA interpreters luaInterpreters = callPackage ./../development/interpreters/lua-5 {}; - inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat luajit_2_1 luajit_2_0; + inherit (luaInterpreters) lua5_1 lua5_2 lua5_2_compat lua5_3 lua5_3_compat lua5_4 lua5_4_compat luajit_2_1 luajit_2_0; lua5 = lua5_2_compat; lua = lua5; @@ -10542,19 +10611,16 @@ in octave = callPackage ../development/interpreters/octave { python = python3; mkDerivation = stdenv.mkDerivation; - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; octave-jit = callPackage ../development/interpreters/octave { python = python3; enableJIT = true; mkDerivation = stdenv.mkDerivation; - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; octaveFull = libsForQt5.callPackage ../development/interpreters/octave { python = python3; enableQt = true; overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; ocropus = callPackage ../applications/misc/ocropus { }; @@ -10962,15 +11028,6 @@ in ant = apacheAnt; apacheKafka = apacheKafka_2_5; - apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; - apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; - apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; }; - apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; }; - apacheKafka_1_1 = callPackage ../servers/apache-kafka { majorVersion = "1.1"; }; - apacheKafka_2_0 = callPackage ../servers/apache-kafka { majorVersion = "2.0"; }; - apacheKafka_2_1 = callPackage ../servers/apache-kafka { majorVersion = "2.1"; }; - apacheKafka_2_2 = callPackage ../servers/apache-kafka { majorVersion = "2.2"; }; - apacheKafka_2_3 = callPackage ../servers/apache-kafka { majorVersion = "2.3"; }; apacheKafka_2_4 = callPackage ../servers/apache-kafka { majorVersion = "2.4"; }; apacheKafka_2_5 = callPackage ../servers/apache-kafka { majorVersion = "2.5"; }; @@ -11468,6 +11525,8 @@ in fffuu = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { }); + ffuf = callPackage ../tools/security/ffuf { }; + flow = callPackage ../development/tools/analysis/flow { ocamlPackages = ocaml-ng.ocamlPackages_4_07; inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -12208,6 +12267,8 @@ in universal-ctags = callPackage ../development/tools/misc/universal-ctags { }; + unused = callPackage ../development/tools/misc/unused { }; + vagrant = callPackage ../development/tools/vagrant {}; vala-language-server = callPackage ../development/tools/vala-language-server {}; @@ -12477,7 +12538,8 @@ in boost172 = callPackage ../development/libraries/boost/1.72.nix { }; boost173 = callPackage ../development/libraries/boost/1.73.nix { }; boost174 = callPackage ../development/libraries/boost/1.74.nix { }; - boost17x = boost174; + boost175 = callPackage ../development/libraries/boost/1.75.nix { }; + boost17x = boost175; boost = boost16x; boost_process = callPackage ../development/libraries/boost-process { }; @@ -12506,7 +12568,7 @@ in hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { }; - niv = haskell.lib.justStaticExecutables haskellPackages.niv; + niv = lib.getBin (haskell.lib.justStaticExecutables haskellPackages.niv); ormolu = haskellPackages.ormolu.bin; @@ -12729,6 +12791,8 @@ in docopt_cpp = callPackage ../development/libraries/docopt_cpp { }; + docopts = callPackage ../development/tools/misc/docopts { }; + dotconf = callPackage ../development/libraries/dotconf { }; draco = callPackage ../development/libraries/draco { }; @@ -12781,6 +12845,8 @@ in enet = callPackage ../development/libraries/enet { }; + entt = callPackage ../development/libraries/entt { }; + epoxy = callPackage ../development/libraries/epoxy {}; libesmtp = callPackage ../development/libraries/libesmtp { }; @@ -13564,6 +13630,8 @@ in indilib = callPackage ../development/libraries/indilib { }; + inih = callPackage ../development/libraries/inih { }; + iniparser = callPackage ../development/libraries/iniparser { }; intel-gmmlib = callPackage ../development/libraries/intel-gmmlib { }; @@ -13959,6 +14027,8 @@ in libdnet = callPackage ../development/libraries/libdnet { }; + libdnf = callPackage ../tools/package-management/libdnf { }; + libdrm = callPackage ../development/libraries/libdrm { }; libdv = callPackage ../development/libraries/libdv { }; @@ -14660,13 +14730,18 @@ in libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; - libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2 { + libtorrent-rasterbar-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + python = python3; }; - libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1 { }; + libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + }; - libtorrentRasterbar = libtorrentRasterbar-1_2_x; + libtorrent-rasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1.nix { }; + + libtorrent-rasterbar = libtorrent-rasterbar-2_0_x; # this is still the new version of the old API libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; @@ -14933,6 +15008,8 @@ in mbedtls = callPackage ../development/libraries/mbedtls { }; + mdctags = callPackage ../development/tools/misc/mdctags { }; + mdds = callPackage ../development/libraries/mdds { }; mediastreamer = callPackage ../development/libraries/mediastreamer { }; @@ -15448,7 +15525,7 @@ in qjson = callPackage ../development/libraries/qjson { }; - qolibri = libsForQt514.callPackage ../applications/misc/qolibri { }; + qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; qt3 = callPackage ../development/libraries/qt-3 { libpng = libpng12; @@ -15568,7 +15645,7 @@ in kwin kwrited milou oxygen plasma-browser-integration plasma-desktop plasma-integration plasma-nm plasma-pa plasma-thunderbolt plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm - systemsettings user-manager xdg-desktop-portal-kde + systemsettings xdg-desktop-portal-kde ; inherit ((plasma5.override { libsForQt5 = self; }).thirdParty) @@ -15628,6 +15705,8 @@ in kreport = callPackage ../development/libraries/kreport { }; + kquickimageedit = callPackage ../development/libraries/kquickimageedit { }; + ldutils = callPackage ../development/libraries/ldutils { }; libcommuni = callPackage ../development/libraries/libcommuni { }; @@ -15676,6 +15755,12 @@ in suffix = "qt5"; }; + poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { + lcms = lcms2; + qt5Support = true; + suffix = "qt5"; + }; + pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; @@ -16001,6 +16086,8 @@ in soapyairspy = callPackage ../applications/radio/soapyairspy { }; + soapyaudio = callPackage ../applications/radio/soapyaudio { }; + soapybladerf = callPackage ../applications/radio/soapybladerf { }; soapyhackrf = callPackage ../applications/radio/soapyhackrf { }; @@ -16013,6 +16100,7 @@ in extraPackages = [ limesuite soapyairspy + soapyaudio soapybladerf soapyhackrf soapyremote @@ -16168,10 +16256,6 @@ in python = python3; }; - sundials_2 = callPackage ../development/libraries/sundials/2.x.nix { - python = python3; - }; - sutils = callPackage ../tools/misc/sutils { }; svrcore = callPackage ../development/libraries/svrcore { }; @@ -16384,16 +16468,14 @@ in vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; - vtk = callPackage ../development/libraries/vtk { + vtk_7 = libsForQt515.callPackage ../development/libraries/vtk/7.x.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration IOKit CFNetwork Security ApplicationServices CoreText IOSurface ImageIO OpenGL GLUT; }; - - vtk_7 = callPackage ../development/libraries/vtk/7.x.nix { - stdenv = if stdenv.isDarwin then stdenv else gcc8Stdenv; + vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration @@ -16409,6 +16491,9 @@ in CoreText IOSurface ImageIO OpenGL GLUT; }; + vtk = vtk_8; + vtkWithQt5 = vtk.override { enableQt = true; }; + vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { }; @@ -16416,8 +16501,6 @@ in vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { }; vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; - vtkWithQt5 = vtk.override { qtLib = qt514; }; - vxl = callPackage ../development/libraries/vxl { libpng = libpng12; stdenv = gcc6Stdenv; # upstream code incompatible with gcc7 @@ -16426,6 +16509,7 @@ in waffle = callPackage ../development/libraries/waffle { }; wally-cli = callPackage ../development/tools/wally-cli { }; + zsa-udev-rules = callPackage ../os-specific/linux/zsa-udev-rules { }; wavpack = callPackage ../development/libraries/wavpack { }; @@ -16531,6 +16615,8 @@ in xdo = callPackage ../tools/misc/xdo { }; + xed = callPackage ../development/libraries/xed { }; + xineLib = callPackage ../development/libraries/xine-lib { }; xautolock = callPackage ../misc/screensavers/xautolock { }; @@ -16616,8 +16702,10 @@ in zmqpp = callPackage ../development/libraries/zmqpp { }; + libzra = callPackage ../development/libraries/libzra { }; + zig = callPackage ../development/compilers/zig { - llvmPackages = llvmPackages_10; + llvmPackages = llvmPackages_11; }; zimlib = callPackage ../development/libraries/zimlib { }; @@ -16803,11 +16891,13 @@ in perlcritic = perlPackages.PerlCritic; - sqitchPg = callPackage ../development/tools/misc/sqitch { - name = "sqitch-pg"; - databaseModule = perlPackages.DBDPg; - sqitchModule = perlPackages.AppSqitch; - }; + sqitchMysql = (callPackage ../development/tools/misc/sqitch { + mysqlSupport = true; + }).overrideAttrs (oldAttrs: { pname = "sqitch-mysql"; }); + + sqitchPg = (callPackage ../development/tools/misc/sqitch { + postgresqlSupport = true; + }).overrideAttrs (oldAttrs: { pname = "sqitch-pg"; }); ### DEVELOPMENT / R MODULES @@ -16994,6 +17084,8 @@ in diod = callPackage ../servers/diod { lua = lua5_1; }; + directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler {}; + dkimproxy = callPackage ../servers/mail/dkimproxy { }; do-agent = callPackage ../servers/monitoring/do-agent { }; @@ -17106,6 +17198,8 @@ in hydron = callPackage ../servers/hydron { }; + icecream = callPackage ../servers/icecream { }; + icingaweb2 = callPackage ../servers/icingaweb2 { }; icingaweb2Modules = { theme-april = callPackage ../servers/icingaweb2/theme-april { }; @@ -17790,9 +17884,9 @@ in inherit (callPackages ../servers/unifi { }) unifiLTS - unifiStable - unifiBeta; - unifi = unifiStable; + unifi5 + unifi6; + unifi = unifi6; urserver = callPackage ../servers/urserver { }; @@ -18009,7 +18103,9 @@ in cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; - cpuset = callPackage ../os-specific/linux/cpuset { }; + cpuset = callPackage ../os-specific/linux/cpuset { + pythonPackages = python3Packages; + }; criu = callPackage ../os-specific/linux/criu { }; @@ -18352,6 +18448,7 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.rtl8761b_support kernelPatches.export_kernel_fpu_functions."5.3" ]; }; @@ -18427,6 +18524,14 @@ in ]; }; + linux_lqx = callPackage ../os-specific/linux/kernel/linux-lqx.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -18741,6 +18846,7 @@ in # zen-kernel linuxPackages_zen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_zen); + linuxPackages_lqx = recurseIntoAttrs (linuxPackagesFor pkgs.linux_lqx); # A function to build a manually-configured kernel linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); @@ -18911,6 +19017,8 @@ in go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; + go-minimock = callPackage ../development/tools/go-minimock { }; + go-protobuf = callPackage ../development/tools/go-protobuf { }; go-symbols = callPackage ../development/tools/go-symbols { }; @@ -19088,8 +19196,6 @@ in raspberrypi-eeprom = callPackage ../os-specific/linux/raspberrypi-eeprom {}; - raspberrypi-tools = callPackage ../os-specific/linux/firmware/raspberrypi/tools.nix {}; - regionset = callPackage ../os-specific/linux/regionset { }; rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { }; @@ -19108,6 +19214,8 @@ in rtl8723bs-firmware = callPackage ../os-specific/linux/firmware/rtl8723bs-firmware { }; + rtl8761b-firmware = callPackage ../os-specific/linux/firmware/rtl8761b-firmware { }; + rtlwifi_new-firmware = callPackage ../os-specific/linux/firmware/rtlwifi_new-firmware { }; s3ql = callPackage ../tools/backup/s3ql { }; @@ -19806,6 +19914,8 @@ in meslo-lg = callPackage ../data/fonts/meslo-lg {}; + meslo-lgs-nf = callPackage ../data/fonts/meslo-lgs-nf {}; + migmix = callPackage ../data/fonts/migmix {}; migu = callPackage ../data/fonts/migu {}; @@ -19850,6 +19960,8 @@ in national-park-typeface = callPackage ../data/fonts/national-park { }; + netease-music-tui = callPackage ../applications/audio/netease-music-tui { }; + nordic = callPackage ../data/themes/nordic { }; nordic-polar = callPackage ../data/themes/nordic-polar { }; @@ -19859,6 +19971,8 @@ in nuclear = callPackage ../applications/audio/nuclear { }; + nuclei = callPackage ../tools/security/nuclei { }; + nullmailer = callPackage ../servers/mail/nullmailer { stdenv = gccStdenv; }; @@ -20591,13 +20705,10 @@ in calibre = calibre-py3; - calligra = libsForQt514.callPackage ../applications/office/calligra { + calligra = libsForQt5.callPackage ../applications/office/calligra { openjpeg = openjpeg_1; - poppler = poppler_0_61.override { - qt5Support = true; - # Must be using the same qt version as calligra itself. - qtbase = qt514.qtbase; - }; + # Must use the same Qt version as Calligra itself: + poppler = libsForQt5.poppler_0_61; }; perkeep = callPackage ../applications/misc/perkeep { }; @@ -21622,6 +21733,7 @@ in }; jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains { + vmopts = config.jetbrains.vmopts or null; jdk = jetbrains.jdk; }) // { jdk = callPackage ../development/compilers/jetbrains-jdk { }; @@ -21942,8 +22054,6 @@ in spectrwm = callPackage ../applications/window-managers/spectrwm { }; - spectral = qt5.callPackage ../applications/networking/instant-messengers/spectral { }; - spotify-cli-linux = callPackage ../applications/audio/spotify-cli-linux { }; spotifyd = callPackage ../applications/audio/spotifyd { @@ -21985,6 +22095,8 @@ in i3-layout-manager = callPackage ../applications/window-managers/i3/layout-manager.nix { }; + i3-resurrect = python3Packages.callPackage ../applications/window-managers/i3/i3-resurrect.nix { }; + i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { }; i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { }; @@ -22266,14 +22378,14 @@ in k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; - kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; + kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; - kdevelop-unwrapped = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop.nix { + kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { llvmPackages = llvmPackages_10; }; - kdev-php = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; - kdev-python = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-python.nix { + kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; + kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix { python = python3; }; @@ -22640,6 +22752,8 @@ in mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; + mediaelch = libsForQt5.callPackage ../applications/misc/mediaelch { }; + mediainfo = callPackage ../applications/misc/mediainfo { }; mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; @@ -22911,7 +23025,7 @@ in if stdenv.isDarwin then callPackage ../applications/audio/musescore/darwin.nix { } else - libsForQt5.callPackage ../applications/audio/musescore { }; + libsForQt514.callPackage ../applications/audio/musescore { }; mmh = callPackage ../applications/networking/mailreaders/mmh { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; @@ -23066,6 +23180,8 @@ in station = callPackage ../applications/networking/station { }; + stochas = callPackage ../applications/audio/stochas { }; + synapse = callPackage ../applications/misc/synapse { }; synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { @@ -23086,6 +23202,8 @@ in sawfish = callPackage ../applications/window-managers/sawfish { }; + sc68 = callPackage ../applications/audio/sc68 { }; + sidplayfp = callPackage ../applications/audio/sidplayfp { }; sndpeek = callPackage ../applications/audio/sndpeek { }; @@ -24425,7 +24543,7 @@ in tribler = callPackage ../applications/networking/p2p/tribler { }; - trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { }; + trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; tudu = callPackage ../applications/office/tudu { }; @@ -24447,6 +24565,10 @@ in twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; + terminal-typeracer = callPackage ../applications/misc/terminal-typeracer { + inherit (darwin.apple_sdk.frameworks) Security; + }; + ueberzug = with python3Packages; toPythonApplication ueberzug; uhhyou.lv2 = callPackage ../applications/audio/uhhyou.lv2 { }; @@ -24458,7 +24580,10 @@ in uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {}); uefitool = uefitoolPackages.new-engine; - ungoogled-chromium = callPackage ../applications/networking/browsers/ungoogled-chromium (config.chromium or {}); + ungoogled-chromium = callPackage ../applications/networking/browsers/chromium ((config.chromium or {}) // { + ungoogled = true; + channel = "ungoogled-chromium"; + }); unigine-valley = callPackage ../applications/graphics/unigine-valley { }; @@ -24729,6 +24854,14 @@ in way-cooler = throw ("way-cooler is abandoned by its author: " + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"); + wayfireApplications = wayfireApplications-unwrapped.withPlugins (plugins: [ plugins.wf-shell ]); + inherit (wayfireApplications) wayfire wcm; + wayfireApplications-unwrapped = callPackage ../applications/window-managers/wayfire/applications.nix { }; + wayfirePlugins = callPackage ../applications/window-managers/wayfire/plugins.nix { + inherit (wayfireApplications-unwrapped) wayfire; + }; + wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { }; + waypipe = callPackage ../applications/networking/remote/waypipe { }; wayv = callPackage ../tools/X11/wayv {}; @@ -25229,7 +25362,7 @@ in zam-plugins = callPackage ../applications/audio/zam-plugins { }; - zanshin = libsForQt514.callPackage ../applications/office/zanshin { + zanshin = libsForQt5.callPackage ../applications/office/zanshin { boost = boost160; }; @@ -25446,6 +25579,7 @@ in anki = python3Packages.callPackage ../games/anki { inherit (darwin.apple_sdk.frameworks) CoreAudio; }; + anki-bin = callPackage ../games/anki/bin.nix { buildFHSUserEnv = buildFHSUserEnvBubblewrap; }; armagetronad = callPackage ../games/armagetronad { }; @@ -25567,7 +25701,7 @@ in dhewm3 = callPackage ../games/dhewm3 {}; - digikam = libsForQt514.callPackage ../applications/graphics/digikam {}; + digikam = libsForQt5.callPackage ../applications/graphics/digikam {}; displaycal = callPackage ../applications/graphics/displaycal {}; @@ -25825,6 +25959,8 @@ in mari0 = callPackage ../games/mari0 { }; + manaplus = callPackage ../games/manaplus { }; + mars = callPackage ../games/mars { }; megaglest = callPackage ../games/megaglest {}; @@ -26007,6 +26143,8 @@ in quantumminigolf = callPackage ../games/quantumminigolf {}; + r2mod_cli = callPackage ../games/r2mod_cli { }; + racer = callPackage ../games/racer { }; redeclipse = callPackage ../games/redeclipse { }; @@ -26449,12 +26587,9 @@ in lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { - # TODO: Update these to qt515 at some point. When doing it, please remove - # the choice of libsForQt5*.sddm in sddm's module. - qt5 = qt514; - libsForQt5 = libsForQt514; inherit pkgs; inherit (lib) makeScope; + inherit qt5 libsForQt5; }); mate = recurseIntoAttrs (callPackage ../desktops/mate { }); @@ -27291,7 +27426,7 @@ in ecl = null; }; maxima-ecl = maxima.override { - ecl = ecl_16_1_2; + inherit ecl; ecl-fasl = true; sbcl = null; }; @@ -27402,6 +27537,8 @@ in stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { }; + stellarsolver = libsForQt5.callPackage ../development/libraries/stellarsolver { }; + astrolabe-generator = callPackage ../applications/science/astronomy/astrolabe-generator { }; tulip = callPackage ../applications/science/misc/tulip { @@ -27473,6 +27610,8 @@ in betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { }; + mission-planner = callPackage ../applications/science/robotics/mission-planner { }; + ### MISC acpilight = callPackage ../misc/acpilight { }; @@ -28605,6 +28744,10 @@ in yaxg = callPackage ../tools/graphics/yaxg {}; + yuzu = libsForQt5.callPackage ../misc/emulators/yuzu { + stdenv = gcc10Stdenv; + }; + zap = callPackage ../tools/networking/zap { }; zigbee2mqtt = callPackage ../servers/zigbee2mqtt { }; @@ -28666,8 +28809,6 @@ in mpvc = callPackage ../applications/misc/mpvc { }; - aucdtect = callPackage ../tools/audio/aucdtect { }; - togglesg-download = callPackage ../tools/misc/togglesg-download { }; discord = import ../applications/networking/instant-messengers/discord { @@ -28911,6 +29052,8 @@ in navidrome = callPackage ../servers/misc/navidrome {}; + zalgo = callPackage ../tools/misc/zalgo { }; + zettlr = callPackage ../applications/misc/zettlr { }; unifi-poller = callPackage ../servers/monitoring/unifi-poller {}; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 35f384a46c6e1..aa7b3c35b82e7 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -123,7 +123,7 @@ in rec { version = "8.11.2"; }; coq_8_12 = callPackage ../applications/science/logic/coq { - version = "8.12.1"; + version = "8.12.2"; }; coq_8_13 = callPackage ../applications/science/logic/coq { version = "8.13+beta1"; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index d044ed8004858..8075b7da4f5c4 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -4,7 +4,7 @@ # # Recommended: simply use `emacsWithPackages` with the packages you want. # -# Alterative: use `emacs`, install everything to a system or user profile +# Alternative: use `emacs`, install everything to a system or user profile # and then add this at the start your `init.el`: /* (require 'package) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2d25ea149a921..46e222261fc8e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -104,6 +104,16 @@ in { buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; }; + ghc8103 = callPackage ../development/compilers/ghc/8.10.3.nix { + # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then + packages.ghc8102BinaryMinimal + else + packages.ghc865Binary; + inherit (buildPackages.python3Packages) sphinx; + buildLlvmPackages = buildPackages.llvmPackages_9; + llvmPackages = pkgs.llvmPackages_9; + }; ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { bootPkgs = packages.ghc8102Binary; inherit (buildPackages.python3Packages) sphinx; @@ -206,6 +216,11 @@ in { ghc = bh.compiler.ghc8102; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; }; + ghc8103 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8103; + ghc = bh.compiler.ghc8103; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; + }; ghc901 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc901; ghc = bh.compiler.ghc901; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 6fe157d2ea2ba..80c5c0a5a8a30 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -826,10 +826,6 @@ let spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; - sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { - ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; - }; - tsort = callPackage ../development/ocaml-modules/tsort { }; tuntap = callPackage ../development/ocaml-modules/tuntap { }; @@ -901,8 +897,6 @@ let ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { }; - ppx_sqlexpr = callPackage ../development/ocaml-modules/sqlexpr/ppx.nix {}; - ppx_tools = if lib.versionAtLeast ocaml.version "4.02" then callPackage ../development/ocaml-modules/ppx_tools {} @@ -1055,29 +1049,32 @@ let janePackage = if lib.versionOlder "4.08" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/janePackage_0_13.nix {} + then callPackage ../development/ocaml-modules/janestreet/janePackage_0_14.nix {} else if lib.versionOlder "4.07" ocaml.version then callPackage ../development/ocaml-modules/janestreet/janePackage_0_12.nix {} else callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; janeStreet = if lib.versionOlder "4.08" ocaml.version - then import ../development/ocaml-modules/janestreet/0.13.nix { - inherit ctypes dune-configurator janePackage num octavius ppxlib re zarith; - inherit (pkgs) openssl; + then import ../development/ocaml-modules/janestreet/0.14.nix { + inherit alcotest angstrom angstrom-async base64 cryptokit ctypes + dune-configurator faraday inotify janePackage js_of_ocaml + js_of_ocaml-ppx lambdasoup magic-mime num octavius ounit + ppxlib re tyxml uri-sexp zarith; + inherit (pkgs) openssl zstd; } else if lib.versionOlder "4.07" ocaml.version then import ../development/ocaml-modules/janestreet/0.12.nix { inherit ctypes janePackage num octavius re; inherit (pkgs) openssl; - ppxlib = ppxlib.override { legacy = true; }; + ppxlib = ppxlib.override { version = "0.8.1"; }; } else import ../development/ocaml-modules/janestreet { inherit janePackage ocamlbuild angstrom ctypes cryptokit; inherit magic-mime num ocaml-migrate-parsetree octavius ounit; inherit ppx_deriving re; inherit (pkgs) openssl; - ppxlib = ppxlib.override { legacy = true; }; + ppxlib = ppxlib.override { version = "0.8.1"; }; }; janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index 8ce855780cf96..52ad7aecd2848 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -6,8 +6,38 @@ # Enable recursion into attribute sets that nix-env normally doesn't look into # so that we can get a more complete picture of the available packages for the # purposes of the index. - packageOverrides = super: { - haskellPackages = super.recurseIntoAttrs super.haskellPackages; - rPackages = super.recurseIntoAttrs super.rPackages; - }; + packageOverrides = super: + let + recurseIntoAttrs = sets: + super.lib.genAttrs + (builtins.filter (set: builtins.hasAttr set super) sets) + (set: super.recurseIntoAttrs (builtins.getAttr set super)); + in recurseIntoAttrs [ + "roundcubePlugins" + "emscriptenfastcompPackages" + "fdbPackages" + "nodePackages_latest" + "nodePackages" + "platformioPackages" + "haskellPackages" + "idrisPackages" + "sconsPackages" + "gns3Packages" + "quicklispPackagesClisp" + "quicklispPackagesSBCL" + "rPackages" + "apacheHttpdPackages_2_4" + "zabbix50" + "zabbix40" + "zabbix30" + "fusePackages" + "nvidiaPackages" + "sourceHanPackages" + "atomPackages" + "emacs26Packages" + "emacs27Packages" + "steamPackages" + "ut2004Packages" + "zeroadPackages" + ]; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2475b1ab6be6b..330abc91db240 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12558,10 +12558,10 @@ let MetaCPANClient = buildPerlPackage { pname = "MetaCPAN-Client"; - version = "2.028000"; + version = "2.029000"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.028000.tar.gz"; - sha256 = "1fcafd1504e838ea37fa1769c751e096fe6ac7bba41c5f62959b156ea27d319a"; + url = "mirror://cpan/authors/id/M/MI/MICKEY/MetaCPAN-Client-2.029000.tar.gz"; + sha256 = "0z75qzrr6r9ijp469majavq8la2jbgn1dq02vdm5m6ip7f887n65"; }; # Most tests are online, so we only include offline tests @@ -13499,6 +13499,22 @@ let }; }; + MojoSAML = buildPerlModule { + pname = "Mojo-SAML"; + version = "0.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JB/JBERGER/Mojo-SAML-0.07.tar.gz"; + sha256 = "03biykpz281z9nmd846jlxwzbaqlqwvh987aw9spl7bgvfn4rhkj"; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ CryptOpenSSLRSA CryptOpenSSLX509 DataGUID Mojolicious XMLCanonicalizeXML ]; + meta = { + description = "A SAML2 toolkit using the Mojo toolkit"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + MojoSQLite = buildPerlModule { pname = "Mojo-SQLite"; version = "3.004"; @@ -22888,6 +22904,21 @@ let }; }; + XMLCanonicalizeXML = buildPerlPackage { + pname = "XML-CanonicalizeXML"; + version = "0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SJ/SJZASADA/XML-CanonicalizeXML-0.10.tar.gz"; + sha256 = "1vl6wbqmq91mc0hkgfwlndbxcv2jm01hj7kpzprw3d6bh144ca77"; + }; + buildInputs = [ pkgs.libxml2 ]; + meta = { + description = "Perl extension for inclusive (1.0 and 1.1) and exclusive canonicalization of XML using libxml2"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + XMLDescent = buildPerlModule { pname = "XML-Descent"; version = "1.04"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index d5bebb9bd8474..cc8ba346ae56c 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c +{ stdenv, lib, pkgs, fetchgit, phpPackage, autoconf, pkgconfig, re2c , gettext, bzip2, curl, libxml2, openssl, gmp, icu64, oniguruma, libsodium , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng @@ -6,7 +6,7 @@ , readline, rsync, fetchpatch, valgrind }: -let +lib.makeScope pkgs.newScope (self: with self; { buildPecl = import ../build-support/build-pecl.nix { php = php.unwrapped; inherit lib; @@ -21,15 +21,10 @@ let pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre; - callPackage = pkgs.newScope { - inherit mkDerivation php buildPecl pcre'; - }; -in -{ - inherit buildPecl; + php = phpPackage; # This is a set of interactive tools based on PHP. - packages = { + tools = { box = callPackage ../development/php-packages/box { }; composer = callPackage ../development/php-packages/composer { }; @@ -550,4 +545,4 @@ in # Produce the final attribute set of all extensions defined. in builtins.listToAttrs namedExtensions); -} +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 309a31d4614fa..80f5f6cab1c31 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -504,8 +504,8 @@ in { awesome-slugify = callPackage ../development/python-modules/awesome-slugify { }; + awkward0 = callPackage ../development/python-modules/awkward0 { }; awkward = callPackage ../development/python-modules/awkward { }; - awkward1 = callPackage ../development/python-modules/awkward1 { }; aws-adfs = callPackage ../development/python-modules/aws-adfs { }; @@ -1175,6 +1175,8 @@ in { cirq = callPackage ../development/python-modules/cirq { }; + ciscomobilityexpress = callPackage ../development/python-modules/ciscomobilityexpress { }; + ciso8601 = callPackage ../development/python-modules/ciso8601 { }; citeproc-py = callPackage ../development/python-modules/citeproc-py { }; @@ -3512,7 +3514,10 @@ in { libtmux = callPackage ../development/python-modules/libtmux { }; - libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override { inherit python; })).python; + libtorrent-rasterbar = if isPy27 then + (toPythonModule (pkgs.libtorrent-rasterbar-1_2_x.override { inherit python; })).python + else + (toPythonModule (pkgs.libtorrent-rasterbar.override { inherit python; })).python; libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; @@ -4789,6 +4794,8 @@ in { pre-commit = callPackage ../development/python-modules/pre-commit { }; + pre-commit-hooks = callPackage ../development/python-modules/pre-commit-hooks { }; + preggy = callPackage ../development/python-modules/preggy { }; premailer = callPackage ../development/python-modules/premailer { }; @@ -5695,6 +5702,8 @@ in { inherit (pkgs) bash subversion apr aprutil expat neon openssl; }; + pysychonaut = callPackage ../development/python-modules/pysychonaut { }; + pytabix = callPackage ../development/python-modules/pytabix { }; pytado = callPackage ../development/python-modules/pytado { }; @@ -7030,6 +7039,7 @@ in { sqlitedict = callPackage ../development/python-modules/sqlitedict { }; + sqlite-fts4 = callPackage ../development/python-modules/sqlite-fts4 { }; sqlite-utils = callPackage ../development/python-modules/sqlite-utils { }; sqlmap = callPackage ../development/python-modules/sqlmap { }; @@ -7200,7 +7210,9 @@ in { telegram = callPackage ../development/python-modules/telegram { }; - telethon = callPackage ../development/python-modules/telethon { }; + telethon = callPackage ../development/python-modules/telethon { + inherit (pkgs) openssl; + }; telethon-session-sqlalchemy = callPackage ../development/python-modules/telethon-session-sqlalchemy { }; @@ -7624,9 +7636,9 @@ in { update-dotdee = callPackage ../development/python-modules/update-dotdee { }; - uproot = callPackage ../development/python-modules/uproot { }; + uproot3 = callPackage ../development/python-modules/uproot3 { }; - uproot-methods = callPackage ../development/python-modules/uproot-methods { }; + uproot3-methods = callPackage ../development/python-modules/uproot3-methods { }; uptime = callPackage ../development/python-modules/uptime { }; @@ -7736,8 +7748,17 @@ in { vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { }; - vtk = toPythonModule (pkgs.vtk_7.override { - inherit (self) python; + vtk = self.vtk_7; + vtk_7 = toPythonModule (pkgs.vtk_7.override { + pythonInterpreter = python; + enablePython = true; + }); + vtk_8 = toPythonModule (pkgs.vtk_8.override { + pythonInterpreter = python; + enablePython = true; + }); + vtk_9 = toPythonModule (pkgs.vtk_9.override { + pythonInterpreter = python; enablePython = true; }); @@ -7851,6 +7872,8 @@ in { WSME = callPackage ../development/python-modules/WSME { }; + wsnsimpy = callPackage ../development/python-modules/wsnsimpy { }; + wsproto = if (pythonAtLeast "3.6") then callPackage ../development/python-modules/wsproto { } else diff --git a/pkgs/top-level/release-alternatives.nix b/pkgs/top-level/release-alternatives.nix index 7479377bd3026..5e309a0129c35 100644 --- a/pkgs/top-level/release-alternatives.nix +++ b/pkgs/top-level/release-alternatives.nix @@ -9,7 +9,7 @@ let blasUsers = [ # "julia_07" "julia_10" "julia_11" "julia_13" "octave" "octaveFull" "fflas-ffpack" "linbox" "R" "ipopt" "hpl" "rspamd" "octopus" - "sundials" "sundials_2" "superlu" "suitesparse_5_3" "suitesparse_4_4" + "sundials" "superlu" "suitesparse_5_3" "suitesparse_4_4" "suitesparse_4_2" "scs" "scalapack" "petsc" "cholmod-extra" "arpack" "qrupdate" "libcint" "iml" "globalarrays" "arrayfire" "armadillo" "xfitter" "lammps" "plink-ng" "quantum-espresso" "siesta" |