diff options
Diffstat (limited to 'pkgs')
224 files changed, 5340 insertions, 2817 deletions
diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix index ad0a41bc0059e..6229cb3a80ddc 100644 --- a/pkgs/applications/audio/mamba/default.nix +++ b/pkgs/applications/audio/mamba/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mamba"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "brummer10"; repo = "Mamba"; rev = "v${version}"; - sha256 = "08dcm0mmka1lbssrgck66v9l2rk3r4y63ij06aw2f9la8a84y20j"; + sha256 = "1l74ckqqrccgsdy430pfsbv4fbzny7zivx399bi2jk1lv06p4h9a"; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index a3ee0e23ec638..a7b97e9daaf89 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -44,13 +44,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "9dQNYWBx8iAifRTZr2FRlYv4keZt5Cfahwi/w01duFg="; + sha256 = "17yfs3ja7vflywhxbn3n3r8n6hl829x257kzplg2vpppppg6ylj6"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix index b837eb07cf1be..526dd245691b7 100644 --- a/pkgs/applications/audio/sonic-lineup/default.nix +++ b/pkgs/applications/audio/sonic-lineup/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sonic-lineup"; - version = "1.0.1"; + version = "1.1"; src = fetchurl { - url = "https://code.soundsoftware.ac.uk/attachments/download/2610/${pname}-${version}.tar.gz"; - sha256 = "0w4v5zr81d8fh97y820r0vj1rrbl0kwgvhfkdnyl4hiabs97b1i7"; + url = "https://code.soundsoftware.ac.uk/attachments/download/2765/${pname}-${version}.tar.gz"; + sha256 = "0k45k9fawcm4s5yy05x00pgww7j8m7k2cxcc7g0fn9vqy7vcbq9h"; }; buildInputs = diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index 48ad9bc971c23..2cd48806f7d02 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; - sha256 = "15pyc3dk4dqlivgzki8sv7xpwg3bbn5xv9338g16a0dbn7s3kich"; + sha256 = "04f7psm0lvc09nw7d2wp0sncf37bym2v7hhxp4v8c8gdgayj7k8m"; }; buildInputs = [ unzip ]; diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix deleted file mode 100644 index d9469fa4b7ae7..0000000000000 --- a/pkgs/applications/audio/transcribe/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, fetchzip, wrapGAppsHook, alsaLib, atk, cairo, gdk-pixbuf -, glib, gst_all_1, gtk3, libSM, libX11, libpng12, pango, zlib }: - -stdenv.mkDerivation rec { - pname = "transcribe"; - version = "8.72"; - - src = if stdenv.hostPlatform.system == "i686-linux" then - fetchzip { - url = "https://www.seventhstring.com/xscribe/downlinux32/xscsetup.tar.gz"; - sha256 = "1h5l7ry9c9awpxfnd29b0wm973ifrhj17xl5d2fdsclw2swsickb"; - } - else if stdenv.hostPlatform.system == "x86_64-linux" then - fetchzip { - url = "https://www.seventhstring.com/xscribe/downlinux64/xsc64setup.tar.gz"; - sha256 = "1rpd3ppnx5i5yrnfbjrx7h7dk48kwl99i9lnpa75ap7nxvbiznm0"; - } - else throw "Platform not supported"; - - nativeBuildInputs = [ wrapGAppsHook ]; - - buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good - gst-plugins-bad gst-plugins-ugly ]; - - dontPatchELF = true; - - libPath = with gst_all_1; stdenv.lib.makeLibraryPath [ - stdenv.cc.cc glib gtk3 atk pango cairo gdk-pixbuf alsaLib - libX11 libSM libpng12 gstreamer gst-plugins-base zlib - ]; - - installPhase = '' - mkdir -p $out/bin $out/libexec $out/share/doc - cp transcribe $out/libexec - cp xschelp.htb readme_gtk.html $out/share/doc - cp -r gtkicons $out/share/icons - - ln -s $out/share/doc/xschelp.htb $out/libexec - - patchelf \ - --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ - $out/libexec/transcribe - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH_1_0" - --prefix LD_LIBRARY_PATH : "${libPath}" - ) - ''; - - postFixup = '' - ln -s $out/libexec/transcribe $out/bin/ - ''; - - meta = with stdenv.lib; { - description = "Software to help transcribe recorded music"; - longDescription = '' - The Transcribe! application is an assistant for people who want - to work out a piece of music from a recording, in order to write - it out, or play it themselves, or both. It doesn't do the - transcribing for you, but it is essentially a specialised player - program which is optimised for the purpose of transcription. It - has many transcription-specific features not found on - conventional music players. - ''; - homepage = "https://www.seventhstring.com/xscribe/"; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ michalrus ]; - broken = true; - }; -} diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 2aa09ec0be818..18d8f7415b56c 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -10,7 +10,7 @@ let pfft-source = fetchFromBitbucket { owner = "jpommier"; repo = "pffft"; - rev = "29e4f76ac53bef048938754f32231d7836401f79"; + rev = "74d7261be17cf659d5930d4830609406bd7553e3"; sha256 = "084csgqa6f1a270bhybjayrh3mpyi2jimc87qkdgsqcp8ycsx1l1"; }; nanovg-source = fetchFromGitHub { diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 5d1d75e31ebcf..ad4fc9728be2d 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://wiki.gnome.org/Apps/DejaDup"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jtojnar joncojonathan ]; + maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index c48e342977e30..03e9923f737ac 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -196,6 +196,26 @@ let ivy-rtags = fix-rtags super.ivy-rtags; + libgit = super.libgit.overrideAttrs(attrs: { + nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ pkgs.cmake ]; + buildInputs = attrs.buildInputs ++ [ pkgs.libgit2 ]; + dontUseCmakeBuildDir = true; + postPatch = '' + sed -i s/'add_subdirectory(libgit2)'// CMakeLists.txt + ''; + postBuild = '' + pushd working/libgit + make + popd + ''; + postInstall = '' + outd=$(echo $out/share/emacs/site-lisp/elpa/libgit-**) + mkdir $outd/build + install -m444 -t $outd/build ./source/src/libegit2.so + rm -r $outd/src $outd/Makefile $outd/CMakeLists.txt + ''; + }); + magit = super.magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index 178494b04981f..18fe236983ac0 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -44,12 +44,8 @@ stdenv.mkDerivation { mkdir -p $out/share/applications mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop - patch package-files/linux/jedit << EOF - 5a6,8 - > # specify the correct JAVA_HOME - > JAVA_HOME=${jdk.jre.home}/jre - > - EOF + # specify the correct JAVA_HOME + sed -i '1a JAVA_HOME=${jdk}' package-files/linux/jedit sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit mkdir -p $out/bin cp package-files/linux/jedit $out/bin/jedit diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 9c8c9d2cdf36a..2747176e01b3c 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -268,12 +268,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.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 = "1sma3ay02lajg6q1g3k05gi7jdja7cf9rxb9v0w62s6z87l719bv"; /* updated by script */ + sha256 = "1kdlmdsfxmwks3rk2dzm5q30vwzpxcwzpyjsir122k36xnqvaqxq"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -281,12 +281,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2020.2.2"; /* updated by script */ + version = "2020.2.3"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1bk6z6mirrykypb4j2wa4744v0m9y1n7973qgj6z3dsifrq9q7zc"; /* updated by script */ + sha256 = "0iv1zmdpbqk8f4cjd6dhgj9mrvxli4dg83jzkhv566sy8wrrx7kb"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -294,12 +294,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2020.2.2"; /* updated by script */ + version = "2020.2.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 = "1r6bbx5hsg82l1pa3syfdi8nbsz6rrfszsw4dmwcnxvccp2hs3mh"; /* updated by script */ + sha256 = "18mzlqibgc6lzwhbmyrni56464qhzla9mss27d45hv0mbv087jn0"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -307,12 +307,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "055hy5jy5151x3gf8hn7ar36br545qr253fz9wrc3b49wydg01x1"; /* updated by script */ + sha256 = "0kbn9q7fvhrzb1w6l8i2nv4cx8qrj74jp7fidj9yk8vkv9lfijg6"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -320,12 +320,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "1g18l3malsyn7dij4w83yfcsb8msa0s89mzlld3dby8hr9bq0aqm"; /* updated by script */ + sha256 = "1196zrcbgrr9271kjrzd2mzvhvxd7hkr1d2a4ij4h8f97qmsd6r6"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -333,12 +333,12 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2020.1.4"; /* updated by script */ + version = "2020.2"; /* updated by script */ description = "Create your own domain-specific language"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/mps/2020.1/MPS-${version}.tar.gz"; - sha256 = "1j5n100fl8yvfla2slm95wv499azwzzxigp1kdcaj8xbc0a0mp7c"; /* updated by script */ + url = "https://download.jetbrains.com/mps/2020.2/MPS-${version}.tar.gz"; + sha256 = "06c0yv9vvz0y5njh1sghn7ijpn1d81mxsyk5xjpj29bvvg511pjs"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -359,12 +359,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0kml58v6clqj0j0vlvghrywxym2n9h41izazzn4srn7wjj9010fa"; /* updated by script */ + sha256 = "1a1vhlc2q5n3dxli0x6ppxx3mgary4gpakcxdp9nylmixjzjph6v"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -372,12 +372,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0ml9fg1dlfg8sdp9n8nlsj7z88dx0ac1kvlpk61p7q5di1lyxc94"; /* updated by script */ + sha256 = "0v64f5sbv1639d6fjg0shfgdy40f1xc2zbn0jqfrx6xmkg7wgsz9"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -398,12 +398,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1pkzql710bc4qdz5pdhh0yx9wkqx85qwkwm1jvvvxbvbsj299vcb"; /* updated by script */ + sha256 = "11v26hpf891nq5vj8i0ad4shhzpy8b7rvyrkr3l29dwfnd83lgpz"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -411,12 +411,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.2.1"; /* updated by script */ + version = "2020.2.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1sx67bms90fsc1bf6pqz1rd1x9aysj0xxb8d7cnclz6bv8kzhgfp"; /* updated by script */ + sha256 = "1w17cf0qj0vyizkzj1frcmi52q5qxbf31msg8df38wy2l8r0b928"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index 4a8c176f5753a..ffef5d5fdde2a 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "micro"; - version = "2.0.5"; + version = "2.0.7"; goPackagePath = "github.com/zyedidia/micro"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "zyedidia"; repo = pname; rev = "v${version}"; - sha256 = "12fyyax1mr0n82s5yhmk90iyyzbh32rppkkpj37c25pal73czdhc"; + sha256 = "07ck1a9arklic3p0z50wcg608cvpba1kljvlfb4fljr6jhv5cmkb"; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/micro/deps.nix b/pkgs/applications/editors/micro/deps.nix index c274ce80ada12..d1cb91c295904 100644 --- a/pkgs/applications/editors/micro/deps.nix +++ b/pkgs/applications/editors/micro/deps.nix @@ -190,6 +190,15 @@ }; } { + goPackagePath = "github.com/xo/terminfo"; + fetch = { + type = "git"; + url = "https://github.com/xo/terminfo"; + rev = "454e5b68f9e8"; + sha256 = "0xvjb09nwbanp7ja4560pwb6b2xr9h0axyr7f5clgncca2k4f1pd"; + }; + } + { goPackagePath = "github.com/yuin/gopher-lua"; fetch = { type = "git"; @@ -203,8 +212,8 @@ fetch = { type = "git"; url = "https://github.com/zyedidia/clipboard"; - rev = "7c45b8673834"; - sha256 = "0ag36wd3830d4s6fvpj05v6f662c5rymgdydsj2gq8aaqplfb0v4"; + rev = "v1.0.3"; + sha256 = "134vnx0r51f08b37yaymlxlfl14qv6r8yzgqz7dxxn1zw9197b3q"; }; } { @@ -257,8 +266,8 @@ fetch = { type = "git"; url = "https://github.com/zyedidia/tcell"; - rev = "v1.4.7"; - sha256 = "1ddaznp0haz35mxfjjh2fmamdrlk1igqg65fz22l5r6vvhcdsfxa"; + rev = "v2.0.2"; + sha256 = "0fr7zm6zcir2bjll5ycdxy9m98gjr3ins7mzmqpd46b3njzbl75z"; }; } { diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 7a5630bb9ba84..718b1b8dcb612 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "12.0"; + version = "12.1"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - sha512 = "91030c9628a08acd85f1a58a7f71eec2e57dc85841c1c475cc6311335b5d8cdc10c1198274b9668b7f61a28d04b07661247dc1c3e36b8e29214aec3748e499e4"; + sha512 = "ad4bb5b191c784ed144b0b4831a8b95e0707c362917833c279d3f6fad11d7b3fb1f004f30121a941b694fc2ce323974b15072aa31cb5449111bc5d33d0d77103"; }; buildCommand = '' diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 5039fa4707c76..d311e644a293f 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "17frdyli375l20mb7sb5bmw000p9cplj4pagmhnb6nibi9wqypdx"; - x86_64-darwin = "1dh5k36fjdfwhidlsg1grjwy3s9jik3pg6xpdgi6946vzqv1vxll"; + x86_64-linux = "10v13j1zg1bpgmr99vqhs1gwcipvnbkln0w6yphwn9440fw9fyp4"; + x86_64-darwin = "1mgi2awrqsm11l1yb8rgmfrxvjfn9z3qvp5np76vgbaibq2ihh0k"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.48.2"; + version = "1.49.1"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 9472f9312469e..f92e910eacce7 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yEd"; - version = "3.20"; + version = "3.20.1"; src = fetchzip { url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip"; - sha256 = "08j8lpn2nd41gavgrj03rlrxl04wcamq1y02f1x1569ykbhycb3m"; + sha256 = "0sd73s700f3gqq5zq1psrqjg6ff2gv49f8vd37v6bv65vdxqxryq"; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index ecd130426de17..25f888bbc8b7c 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib -, gdk-pixbuf }: +, gdk-pixbuf, gdk-pixbuf-xlib }: assert stdenv.hostPlatform.system == "i686-linux"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { # versions. libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf ]; + [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf gdk-pixbuf-xlib ]; passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux"; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 2190307fbb569..2a28a4edc4f5b 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -9,6 +9,7 @@ , colladaSupport ? true, opencollada , makeWrapper , pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL +, embree }: with lib; @@ -17,11 +18,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.83.5"; + version = "2.90.0"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "0xyawly00a59hfdb6b7va84k5fhcv2mxnzd77vs22bzi9y7sap43"; + sha256 = "08qkvgdfrqh4ljqw5m64bbki1dsfcs4xnwzq6829z3ddhiwrxw84"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { (opensubdiv.override { inherit cudaSupport; }) tbb makeWrapper + embree ] ++ (if (!stdenv.isDarwin) then [ libXi libX11 libXext libXrender @@ -50,8 +52,11 @@ stdenv.mkDerivation rec { ++ optional cudaSupport cudatoolkit ++ optional colladaSupport opencollada; - postPatch = - if stdenv.isDarwin then '' + postPatch = '' + # allow usage of dynamically linked embree + rm build_files/cmake/Modules/FindEmbree.cmake + '' + + (if stdenv.isDarwin then '' : > build_files/cmake/platform/platform_apple_xcode.cmake substituteInPlace source/creator/CMakeLists.txt \ --replace '${"$"}{LIBDIR}/python' \ @@ -77,7 +82,7 @@ stdenv.mkDerivation rec { 'set(OPENEXR_INCLUDE_DIRS "${openexr.dev}/include/OpenEXR") #' '' else '' substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' - ''; + ''); cmakeFlags = [ diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index b1e9f3ac35a31..87e59d4292fcd 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { inherit (src.meta) homepage; description = "A Go based command line tool for exercism.io"; license = licenses.mit; - maintainers = [ maintainers.rbasso ]; + maintainers = [ maintainers.rbasso maintainers.nobbz ]; }; } diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 63ca213c2c423..828b3ca9bf0b3 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk }: stdenv.mkDerivation rec { pname = "gpsprune"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk11 ]; + buildInputs = [ jdk ]; desktopItem = makeDesktopItem { name = "gpsprune"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildCommand = '' mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/gpsprune.jar - makeWrapper ${jdk11}/bin/java $out/bin/gpsprune \ + makeWrapper ${jdk}/bin/java $out/bin/gpsprune \ --add-flags "-jar $out/share/java/gpsprune.jar" mkdir -p $out/share/applications cp $desktopItem/share/applications"/"* $out/share/applications diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index e5a2b87f16ef9..09717cd642658 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -13,14 +13,13 @@ in buildPythonApplication rec { pname = "gramps"; nativeBuildInputs = [ wrapGAppsHook gettext ]; - buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ] + buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ] # Map support ++ stdenv.lib.optional enableOSM osm-gps-map # Graphviz support ++ stdenv.lib.optional enableGraphviz graphviz # Ghostscript support ++ stdenv.lib.optional enableGhostscript ghostscript - ; src = fetchFromGitHub { @@ -60,6 +59,5 @@ in buildPythonApplication rec { description = "Genealogy software"; homepage = "https://gramps-project.org"; license = licenses.gpl2; - maintainers = with maintainers; [ joncojonathan ]; }; } diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 1626fc440e934..19034c1dc7628 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "16p18svfcp201gd624wzmf0gpdvywybxp8539igin6s70k6rpc97"; + sha256 = "18paabqfxz49fahdi4fs5z870aynmyfj3xw8q768qffgc26zhl3m"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index ea579ce411740..23f80eaa9cabc 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -87,7 +87,7 @@ with builtins; buildDotnetPackage rec { dynlibPath = stdenv.lib.makeLibraryPath [ gtk2 ]; - postInstall = + postInstall = let extractFDeskIcons = ./extractWinRscIconsToStdFreeDesktopDir.sh; in @@ -111,7 +111,7 @@ with builtins; buildDotnetPackage rec { meta = { description = "GUI password manager with strong cryptography"; homepage = "http://www.keepass.info/"; - maintainers = with stdenv.lib.maintainers; [ amorsillo obadz joncojonathan jraygauthier ]; + maintainers = with stdenv.lib.maintainers; [ amorsillo obadz jraygauthier ]; platforms = with stdenv.lib.platforms; all; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix index 62951f3fcabb6..1965a8ad5ec51 100644 --- a/pkgs/applications/misc/navi/default.nix +++ b/pkgs/applications/misc/navi/default.nix @@ -2,21 +2,23 @@ rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.10.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "1fpfc3ikb6rhb8m0dp9ybh46mnqaw361rrsbv6yrivwfm3zc4w2w"; + sha256 = "0izmf4flwwn2h1wwpsnghb6rd494lj63hhsky1v9v6l1l641had4"; }; - cargoSha256 = "0klizxrb92h7qfxs89m08ksdq698wx4kxsdhqhr5ld9dy3b6ks32"; + cargoSha256 = "19xv9kbmxbp84lj8ycifsdr7sw9vhwgla7cdmrvlhayiq5r04xd7"; nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram $out/bin/navi --prefix PATH : ${lib.makeBinPath [ fzf wget ]} + wrapProgram $out/bin/navi \ + --prefix PATH : "$out/bin" \ + --prefix PATH : ${lib.makeBinPath [ fzf wget ]} ''; meta = with lib; { diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 26b6f3297644b..a0d370c00ac1e 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -1,23 +1,27 @@ { boost , fetchFromGitHub +, libGLU , mkDerivationWith , muparser , pkgconfig +, qtbase , qmake -, qt5 +, qtscript +, qtsvg +, qtxmlpatterns +, qttools , stdenv -, libGLU }: mkDerivationWith stdenv.mkDerivation rec { pname = "qcad"; - version = "3.25.0.0"; + version = "3.25.2.0"; src = fetchFromGitHub { owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "07qph2645m1wi9yi04ixdvx8dli03q1vimj3laqdmnpipi54lljc"; + sha256 = "1lz6q9n2p0l7k8rwqsdj6av9p3426423g5avc4y6s7nbk36280mz"; }; patches = [ @@ -25,11 +29,11 @@ mkDerivationWith stdenv.mkDerivation rec { ]; postPatch = '' - if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} ]; then - mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} + if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version} ]; then + mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version} cp \ src/3rdparty/qt-labs-qtscriptgenerator-5.14.0/qt-labs-qtscriptgenerator-5.14.0.pro \ - src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}/qt-labs-qtscriptgenerator-${qt5.qtbase.version}.pro + src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version}/qt-labs-qtscriptgenerator-${qtbase.version}.pro fi ''; @@ -61,6 +65,10 @@ mkDerivationWith stdenv.mkDerivation rec { cp -r plugins $out/lib/plugins cp -r patterns $out/lib/patterns + # workaround to fix the library browser: + rm -r $out/lib/plugins/sqldrivers + ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/sqldrivers + install -Dm644 scripts/qcad_icon.svg $out/share/icons/hicolor/scalable/apps/qcad.svg runHook postInstall @@ -70,16 +78,16 @@ mkDerivationWith stdenv.mkDerivation rec { boost muparser libGLU - qt5.qtbase - qt5.qtscript - qt5.qtsvg - qt5.qtxmlpatterns + qtbase + qtscript + qtsvg + qtxmlpatterns ]; nativeBuildInputs = [ pkgconfig - qt5.qmake - qt5.qttools + qmake + qttools ]; enableParallelBuilding = true; @@ -89,6 +97,6 @@ mkDerivationWith stdenv.mkDerivation rec { homepage = "https://qcad.org"; license = licenses.gpl3; maintainers = with maintainers; [ yvesf ]; - platforms = qt5.qtbase.meta.platforms; + platforms = qtbase.meta.platforms; }; } diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/applications/misc/snowsql/default.nix index a860b555b597c..720ee5f679963 100644 --- a/pkgs/applications/misc/snowsql/default.nix +++ b/pkgs/applications/misc/snowsql/default.nix @@ -8,20 +8,17 @@ stdenv.mkDerivation rec { pname = "snowsql"; - version = "1.2.5"; + majorVersion = "1.2"; + version = "${majorVersion}.9"; src = fetchurl { - url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/1.2/linux_x86_64/snowflake-snowsql-1.2.5-1.x86_64.rpm"; - sha256 = "c66e2044640197f4a5b5a16b89e8e7c6a816aa539004a0fb016aab185795f2d5"; + url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/${majorVersion}/linux_x86_64/snowflake-snowsql-${version}-1.x86_64.rpm"; + sha256 = "1k9dyr4vyqivpg054kbvs0jdwhbqbmlp9lsyxgazdsviw8ch70c8"; }; nativeBuildInputs = [ rpmextract makeWrapper ]; - libPath = - stdenv.lib.makeLibraryPath - [ - openssl - ]; + libPath = stdenv.lib.makeLibraryPath [ openssl ]; buildCommand = '' mkdir -p $out/bin/ @@ -37,7 +34,6 @@ stdenv.mkDerivation rec { makeWrapper $out/lib64/snowflake/snowsql/snowsql $out/bin/snowsql \ --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/lib64/snowflake/snowsql \ - ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index eb3894c7b47d2..6db651ff39297 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -22,7 +22,14 @@ buildPythonApplication rec { watchdog ]; - checkInputs = [ mock freezegun coverage green pylint ]; + checkInputs = [ mock freezegun pylint ]; + + # Skip test that has been reported multiple times upstream without result: + # bram85/topydo#271, bram85/topydo#274. + checkPhase = '' + substituteInPlace test/test_revert_command.py --replace 'test_revert_ls' 'dont_test_revert_ls' + python -m unittest discover + ''; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4e3960ee72968..a79a48fffcc5c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -17,7 +17,7 @@ , libXScrnSaver, libXcursor, libXtst, libGLU, libGL , protobuf, speechd, libXdamage, cups , ffmpeg_3, libxslt, libxml2, at-spi2-core -, jre +, jre8 , pipewire_0_2 # optional dependencies @@ -50,6 +50,8 @@ with stdenv.lib; # see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html 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; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 78ee213490888..5ca52a3953f1b 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -21,7 +21,7 @@ , pulseaudioSupport ? stdenv.isLinux, libpulseaudio , ffmpegSupport ? true , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook -, waylandSupport ? true, libxkbcommon +, waylandSupport ? true, libxkbcommon, pipewire , gssSupport ? true, kerberos ## privacy-related options @@ -94,6 +94,11 @@ stdenv.mkDerivation ({ patches = [ ./env_var_for_system_dir.patch + (fetchpatch { + # https://src.fedoraproject.org/rpms/firefox/blob/master/f/firefox-pipewire-0-3.patch + url = "https://src.fedoraproject.org/rpms/firefox/raw/e99b683a352cf5b2c9ff198756859bae408b5d9d/f/firefox-pipewire-0-3.patch"; + sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab"; + }) ] ++ patches; @@ -123,7 +128,7 @@ stdenv.mkDerivation ({ ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3 ++ lib.optional gssSupport kerberos - ++ lib.optional waylandSupport libxkbcommon + ++ lib.optionals waylandSupport [ libxkbcommon pipewire ] ++ lib.optionals stdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox CoreLocation Foundation libobjc AddressBook cups ]; @@ -135,6 +140,11 @@ stdenv.mkDerivation ({ postPatch = '' rm -rf obj-x86_64-pc-linux-gnu + + # needed for enabling webrtc+pipewire + substituteInPlace \ + media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build \ + --replace /usr/include ${pipewire.dev}/include '' + lib.optionalString (lib.versionAtLeast ffversion "80") '' substituteInPlace dom/system/IOUtils.h \ --replace '#include "nspr/prio.h"' '#include "prio.h"' diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 0e3e7205e1f9b..69ca08e990c76 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchzip, python3Packages +{ stdenv, lib, fetchurl, fetchzip, python3 , mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, glib-networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt, gst_all_1 ? null @@ -10,6 +10,7 @@ assert withMediaPlayback -> gst_all_1 != null; let + python3Packages = python3.pkgs; pdfjs = let version = "2.4.456"; in diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix index f9a2693f24303..421d6bb745a05 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar +{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, fetchurl # default dependencies -, bzip2, flac, speex, libopus +, gnutar, bzip2, flac, speex, libopus , libevent, expat, libjpeg, snappy , libpng, libcap , xdg_utils, yasm, nasm, minizip, libwebp @@ -17,7 +17,7 @@ , libXScrnSaver, libXcursor, libXtst, libGLU, libGL , protobuf, speechd, libXdamage, cups , ffmpeg_3, libxslt, libxml2, at-spi2-core -, jre +, jre8 , pipewire_0_2 # optional dependencies @@ -41,6 +41,7 @@ , ungoogled-chromium , ungoogled ? false +, channel , upstream-info }: @@ -51,6 +52,8 @@ with stdenv.lib; # see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html 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; @@ -110,7 +113,7 @@ let versionRange = min-version: upto-version: let inherit (upstream-info) version; result = versionAtLeast version min-version && versionOlder version upto-version; - stable-version = (import ./upstream-info.nix).stable.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 @@ -123,10 +126,13 @@ let }; base = rec { name = "${packageName}-unwrapped-${version}"; - inherit (upstream-info) channel version; - inherit packageName buildType buildPath; + inherit (upstream-info) version; + inherit channel packageName buildType buildPath; - src = upstream-info.main; + src = fetchurl { + url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; + inherit (upstream-info) sha256; + }; nativeBuildInputs = [ ninja which python2Packages.python perl pkgconfig @@ -151,8 +157,9 @@ let ++ optional pulseSupport libpulseaudio ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; - patches = [ + patches = optionals (versionRange "68" "86") [ ./patches/nix_plugin_paths_68.patch + ] ++ [ ./patches/remove-webp-include-69.patch ./patches/no-build-timestamps.patch ./patches/widevine-79.patch @@ -166,12 +173,18 @@ let # # ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ] # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) - ] ++ optionals (useVaapi) [ # Improvements for the VA-API build: + ] ++ optionals (useVaapi && versionRange "68" "86") [ # Improvements for the VA-API build: ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium) ]; - postPatch = '' + postPatch = optionalString (!versionRange "0" "86") '' + # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.): + substituteInPlace native_client/SConstruct \ + --replace "#! -*- python -*-" "" + substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ + --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" + '' + '' # 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 \ @@ -300,8 +313,8 @@ let use_system_libdrm = true; system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; } // optionalAttrs ungoogled { - closure_compile = false; enable_hangout_services_extension = false; + enable_js_type_check = false; enable_mdns = false; enable_nacl_nonsfi = false; enable_one_click_signin = false; @@ -313,7 +326,6 @@ let google_api_key = ""; google_default_client_id = ""; google_default_client_secret = ""; - optimize_webui = false; safe_browsing_mode = 0; use_official_google_api_keys = false; use_unofficial_version_number = false; @@ -366,9 +378,11 @@ let origRpath="$(patchelf --print-rpath "$chromiumBinary")" patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary" ''; + + passthru.updateScript = ./update.py; }; # 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 index 9051fc55feb47..7c581ee633f6b 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix @@ -1,5 +1,5 @@ -{ newScope, config, stdenv, llvmPackages_9, llvmPackages_10 -, makeWrapper, ed, gnugrep +{ newScope, config, stdenv, fetchurl, makeWrapper +, llvmPackages_10, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null , pipewire_0_2 @@ -29,30 +29,43 @@ let callPackage = newScope chromium; - chromium = { + chromium = rec { inherit stdenv llvmPackages; - upstream-info = (callPackage ./update.nix {}).getChannel channel; + upstream-info = (lib.importJSON ./upstream-info.json).${channel}; mkChromiumDerivation = callPackage ./common.nix ({ - inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; + inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs + cupsSupport pulseSupport useOzone; inherit ungoogled; # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): gnChromium = gn.overrideAttrs (oldAttrs: { - version = "2020-03-23"; + version = "2020-05-19"; src = fetchgit { url = "https://gn.googlesource.com/gn"; - rev = "5ed3c9cc67b090d5e311e4bd2aba072173e82db9"; - sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy"; + rev = "d0a6f072070988e7b038496c4e7d6c562b649732"; + sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17"; }; }); - } // lib.optionalAttrs (channel == "dev") { + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "86") { + llvmPackages = llvmPackages_11; gnChromium = gn.overrideAttrs (oldAttrs: { - version = "2020-05-19"; + version = "2020-07-20"; src = fetchgit { url = "https://gn.googlesource.com/gn"; - rev = "d0a6f072070988e7b038496c4e7d6c562b649732"; - sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17"; + rev = "3028c6a426a4aaf6da91c4ebafe716ae370225fe"; + sha256 = "0h3wf4152zdvrbb0jbj49q6814lfl3rcy5mj8b2pl9s0ahvkbc6q"; + }; + }); + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") { + llvmPackages = llvmPackages_11; + useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/ + gnChromium = gn.overrideAttrs (oldAttrs: { + version = "2020-08-17"; + src = fetchgit { + url = "https://gn.googlesource.com/gn"; + rev = "6f13aaac55a977e1948910942675c69f2b4f7a94"; + sha256 = "01hpma1sllpdx09mvr4d6073sg6zmk6iv44kd3r28khymcj4s251"; }; }); }); @@ -66,22 +79,33 @@ let 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 = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation { + widevineCdm = stdenv.mkDerivation { name = "chrome-widevine-cdm"; - # The .deb file for Google Chrome - src = upstream-info.binary; + src = chromeSrc; phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; unpackCmd = let widevineCdmPath = - if upstream-info.channel == "stable" then + if channel == "stable" then "./opt/google/chrome/WidevineCdm" - else if upstream-info.channel == "beta" then + else if channel == "beta" then "./opt/google/chrome-beta/WidevineCdm" - else if upstream-info.channel == "dev" then + else if channel == "dev" then "./opt/google/chrome-unstable/WidevineCdm" else throw "Unknown chromium channel."; @@ -191,10 +215,13 @@ in stdenv.mkDerivation { '' + '' # libredirect causes chromium to deadlock on startup - export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | ${gnugrep}/bin/grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')" + 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 @@ -214,6 +241,7 @@ in stdenv.mkDerivation { passthru = { inherit (chromium) upstream-info browser; mkDerivation = chromium.mkChromiumDerivation; - inherit sandboxExecutableName; + inherit chromeSrc sandboxExecutableName; + updateScript = ./update.py; }; } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix index 109e410d5eef9..73f4e4c9e83d8 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix @@ -1,6 +1,6 @@ { - "84.0.4147.89" = { - rev = "84.0.4147.89-1"; - sha256 = "1bqvcq3dj6615198j7cz3ylyyic5zpis06capvl6ybl1na3ainb0"; + "85.0.4183.102" = { + rev = "85.0.4183.102-1"; + sha256 = "1mdx4a5zcs3an9yx1jxx4amq8p9rcj0hv76r8y7nz6cpsfgd9n3y"; }; } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix deleted file mode 100644 index 6dff17c69ddb9..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix +++ /dev/null @@ -1,271 +0,0 @@ -let maybePkgs = import ../../../../../. {}; in - -{ stdenv ? maybePkgs.stdenv -, runCommand ? maybePkgs.runCommand -, fetchurl ? maybePkgs.fetchurl -, writeText ? maybePkgs.writeText -, curl ? maybePkgs.curl -, cacert ? maybePkgs.cacert -, nix ? maybePkgs.nix -}: - -let - inherit (stdenv) lib; - - sources = if builtins.pathExists ./upstream-info.nix - then import ./upstream-info.nix - else {}; - - bucketURL = "https://commondatastorage.googleapis.com/" - + "chromium-browser-official"; - - mkVerURL = version: "${bucketURL}/chromium-${version}.tar.xz"; - - debURL = "https://dl.google.com/linux/chrome/deb/pool/main/g"; - - getDebURL = channelName: version: arch: mirror: let - packageSuffix = if channelName == "dev" then "unstable" else channelName; - packageName = "google-chrome-${packageSuffix}"; - in "${mirror}/${packageName}/${packageName}_${version}-1_${arch}.deb"; - - # Untrusted mirrors, don't try to update from them! - debMirrors = [ - "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" - ]; - -in { - getChannel = channel: let - chanAttrs = builtins.getAttr channel sources; - in { - inherit channel; - inherit (chanAttrs) version; - - main = fetchurl { - url = mkVerURL chanAttrs.version; - inherit (chanAttrs) sha256; - }; - - binary = fetchurl (let - mkUrls = arch: let - mkURLForMirror = getDebURL channel chanAttrs.version arch; - in map mkURLForMirror ([ debURL ] ++ debMirrors); - in if stdenv.is64bit && chanAttrs ? sha256bin64 then { - urls = mkUrls "amd64"; - sha256 = chanAttrs.sha256bin64; - } else if !stdenv.is64bit && chanAttrs ? sha256bin32 then { - urls = mkUrls "i386"; - sha256 = chanAttrs.sha256bin32; - } else throw "No Chrome plugins are available for your architecture."); - }; - - update = let - csv2nix = name: src: import (runCommand "${name}.nix" { - src = builtins.fetchurl src; - } '' - esc() { echo "\"$(echo "$1" | sed -e 's/"\\$/\\&/')\""; } # ohai emacs " - IFS=, read -r -a headings <<< "$(head -n1 "$src")" - echo "[" > "$out" - tail -n +2 "$src" | while IFS=, read -r -a line; do - echo " {" - for idx in "''${!headings[@]}"; do - echo " $(esc "''${headings[idx]}") = $(esc ''${line[$idx]});" - done - echo " }" - done >> "$out" - echo "]" >> "$out" - ''); - - channels = lib.fold lib.recursiveUpdate {} (map (attrs: { - ${attrs.os}.${attrs.channel} = attrs // { - history = let - drvName = "omahaproxy-${attrs.os}.${attrs.channel}-info"; - history = csv2nix drvName "http://omahaproxy.appspot.com/history"; - cond = h: attrs.os == h.os && attrs.channel == h.channel - && lib.versionOlder h.version attrs.current_version; - # Note that this is a *reverse* sort! - sorter = a: b: lib.versionOlder b.version a.version; - sorted = builtins.sort sorter (lib.filter cond history); - in map (lib.flip removeAttrs ["os" "channel"]) sorted; - version = attrs.current_version; - }; - }) (csv2nix "omahaproxy-info" "http://omahaproxy.appspot.com/all?csv=1")); - - /* - XXX: This is essentially the same as: - - builtins.tryEval (builtins.fetchurl url) - - ... except that tryEval on fetchurl isn't working and doesn't catch - errors for fetchurl, so we go for a different approach. - - We only have fixed-output derivations that can have networking access, so - we abuse SHA1 and its weaknesses to forge a fixed-output derivation which - is not so fixed, because it emits different contents that have the same - SHA1 hash. - - Using this method, we can distinguish whether the URL is available or - whether it's not based on the actual content. - - So let's use tryEval as soon as it's working with fetchurl in Nix. - */ - tryFetch = url: let - # SHA1 hash collisions from https://shattered.io/static/shattered.pdf: - collisions = runCommand "sha1-collisions" { - outputs = [ "out" "good" "bad" ]; - base64 = '' - QlpoOTFBWSZTWbL5V5MABl///////9Pv///v////+/////HDdK739/677r+W3/75rUNr4 - Aa/AAAAAAACgEVTRtQDQAaA0AAyGmjTQGmgAAANGgAaMIAYgGgAABo0AAAAAADQAIAGQ0 - MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk - 0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIAN - GgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRp - o0GIGgBoGQAABVTUExEZATTICnkxNR+p6E09JppoyamjGhkm0ammIyaekbUejU9JiGnqZ - qaaDxJ6m0JkZMQ2oaYmJ6gxqMyE2TUzJqfItligtJQJfYbl9Zy9QjQuB5mHQRdSSXCCTH - MgmSDYmdOoOmLTBJWiCpOhMQYpQlOYpJjn+wQUJSTCEpOMekaFaaNB6glCC0hKEJdHr6B - mUIHeph7YxS8WJYyGwgWnMTFJBDFSxSCCYljiEk7HZgJzJVDHJxMgY6tCEIIWgsKSlSZ0 - S8GckoIIF+551Ro4RCw260VCEpWJSlpWx/PMrLyVoyhWMAneDilBcUIeZ1j6NCkus0qUC - Wnahhk5KT4GpWMh3vm2nJWjTL9Qg+84iExBJhNKpbV9tvEN265t3fu/TKkt4rXFTsV+Nc - upJXhOhOhJMQQktrqt4K8mSh9M2DAO2X7uXGVL9YQxUtzQmS7uBndL7M6R7vX869VxqPu - renSuHYNq1yTXOfNWLwgvKlRlFYqLCs6OChDp0HuTzCWscmGudLyqUuwVGG75nmyZhKpJ - yOE/pOZyHyrZxGM51DYIN+Jc8yVJgAykxKCEtW55MlfudLg3KG6TtozalunXrroSxUpVL - StWrWLFihMnVpkyZOrQnUrE6xq1CGtJlbAb5ShMbV1CZgqlKC0wCFCpMmUKSEkvFLaZC8 - wHOCVAlvzaJQ/T+XLb5Dh5TNM67p6KZ4e4ZSGyVENx2O27LzrTIteAreTkMZpW95GS0CE - JYhMc4nToTJ0wQhKEyddaLb/rTqmgJSlkpnALxMhlNmuKEpkEkqhKUoEq3SoKUpIQcDgW - lC0rYahMmLuPQ0fHqZaF4v2W8IoJ2EhMhYmSw7qql27WJS+G4rUplToFi2rSv0NSrVvDU - pltQ8Lv6F8pXyxmFBSxiLSxglNC4uvXVKmAtusXy4YXGX1ixedEvXF1aX6t8adYnYCpC6 - rW1ZzdZYlCCxKEv8vpbqdSsXl8v1jCQv0KEPxPTa/5rtWSF1dSgg4z4KjfIMNtgwWoWLE - sRhKxsSA9ji7V5LRPwtumeQ8V57UtFSPIUmtQdOQfseI2Ly1DMtk4Jl8n927w34zrWG6P - i4jzC82js/46Rt2IZoadWxOtMInS2xYmcu8mOw9PLYxQ4bdfFw3ZPf/g2pzSwZDhGrZAl - 9lqky0W+yeanadC037xk496t0Dq3ctfmqmjgie8ln9k6Q0K1krb3dK9el4Xsu44LpGcen - r2eQZ1s1IhOhnE56WnXf0BLWn9Xz15fMkzi4kpVxiTKGEpffErEEMvEeMZhUl6yD1SdeJ - YbxzGNM3ak2TAaglLZlDCVnoM6wV5DRrycwF8Zh/fRsdmhkMfAO1duwknrsFwrzePWeMw - l107DWzymxdQwiSXx/lncnn75jL9mUzw2bUDqj20LTgtawxK2SlQg1CCZDQMgSpEqLjRM - sykM9zbSIUqil0zNk7Nu+b5J0DKZlhl9CtpGKgX5uyp0idoJ3we9bSrY7PupnUL5eWiDp - V5mmnNUhOnYi8xyClkLbNmAXyoWk7GaVrM2umkbpqHDzDymiKjetgzTocWNsJ2E0zPcfh - t46J4ipaXGCfF7fuO0a70c82bvqo3HceIcRlshgu73seO8BqlLIap2z5jTOY+T2ucCnBt - Atva3aHdchJg9AJ5YdKHz7LoA3VKmeqxAlFyEnQLBxB2PAhAZ8KvmuR6ELXws1Qr13Nd1 - i4nsp189jqvaNzt+0nEnIaniuP1+/UOZdyfoZh57ku8sYHKdvfW/jYSUks+0rK+qtte+p - y8jWL9cOJ0fV8rrH/t+85/p1z2N67p/ZsZ3JmdyliL7lrNxZUlx0MVIl6PxXOUuGOeArW - 3vuEvJ2beoh7SGyZKHKbR2bBWO1d49JDIcVM6lQtu9UO8ec8pOnXmkcponBPLNM2CwZ9k - NC/4ct6rQkPkQHMcV/8XckU4UJCy+VeTA== - ''; - } '' - echo "$base64" | base64 -d | tar xj - mv good.pdf "$good" - mv bad.pdf "$bad" - touch "$out" - ''; - - cacheVal = let - urlHash = builtins.hashString "sha256" url; - timeSlice = builtins.currentTime / 600; - in "${urlHash}-${toString timeSlice}"; - - in { - success = import (runCommand "check-success" { - result = stdenv.mkDerivation { - name = "tryfetch-${cacheVal}"; - inherit url; - - outputHash = "d00bbe65d80f6d53d5c15da7c6b4f0a655c5a86a"; - outputHashMode = "flat"; - outputHashAlgo = "sha1"; - - nativeBuildInputs = [ curl ]; - preferLocalBuild = true; - - inherit (collisions) good bad; - - buildCommand = '' - if SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" \ - curl -s -L -f -I "$url" > /dev/null; then - cp "$good" "$out" - else - cp "$bad" "$out" - fi - ''; - - impureEnvVars = lib.fetchers.proxyImpureEnvVars; - }; - inherit (collisions) good; - } '' - if cmp -s "$result" "$good"; then - echo true > "$out" - else - echo false > "$out" - fi - ''); - value = builtins.fetchurl url; - }; - - fetchLatest = channel: let - result = tryFetch (mkVerURL channel.version); - in if result.success then result.value else fetchLatest (channel // { - version = if channel.history != [] - then (lib.head channel.history).version - else throw "Unfortunately there's no older version than " + - "${channel.version} available for channel " + - "${channel.channel} on ${channel.os}."; - history = lib.tail channel.history; - }); - - getHash = path: import (runCommand "gethash.nix" { - inherit path; - nativeBuildInputs = [ nix ]; - } '' - sha256="$(nix-hash --flat --base32 --type sha256 "$path")" - echo "\"$sha256\"" > "$out" - ''); - - isLatest = channel: version: let - ourVersion = sources.${channel}.version or null; - in if ourVersion == null then false - else lib.versionOlder version sources.${channel}.version - || version == sources.${channel}.version; - - # We only support GNU/Linux right now. - linuxChannels = let - genLatest = channelName: channel: let - newUpstream = { - inherit (channel) version; - sha256 = getHash (fetchLatest channel); - }; - keepOld = let - oldChannel = sources.${channelName}; - in { - inherit (oldChannel) version sha256; - } // lib.optionalAttrs (oldChannel ? sha256bin32) { - inherit (oldChannel) sha256bin32; - } // lib.optionalAttrs (oldChannel ? sha256bin64) { - inherit (oldChannel) sha256bin64; - }; - in if isLatest channelName channel.version then keepOld else newUpstream; - in lib.mapAttrs genLatest channels.linux; - - getLinuxFlash = channelName: channel: let - inherit (channel) version; - fetchArch = arch: tryFetch (getDebURL channelName version arch debURL); - packages = lib.genAttrs ["i386" "amd64"] fetchArch; - isNew = arch: attr: !(builtins.hasAttr attr channel) - && packages.${arch}.success; - in channel // lib.optionalAttrs (isNew "i386" "sha256bin32") { - sha256bin32 = getHash (packages.i386.value); - } // lib.optionalAttrs (isNew "amd64" "sha256bin64") { - sha256bin64 = getHash (packages.amd64.value); - }; - - newChannels = lib.mapAttrs getLinuxFlash linuxChannels; - - dumpAttrs = indent: attrs: let - mkVal = val: if lib.isAttrs val then dumpAttrs (indent + 1) val - else "\"${lib.escape ["$" "\\" "\""] (toString val)}\""; - mkIndent = level: lib.concatStrings (builtins.genList (_: " ") level); - mkAttr = key: val: "${mkIndent (indent + 1)}${key} = ${mkVal val};\n"; - attrLines = lib.mapAttrsToList mkAttr attrs; - in "{\n" + (lib.concatStrings attrLines) + (mkIndent indent) + "}"; - in writeText "chromium-new-upstream-info.nix" '' - # This file is autogenerated from update.sh in the same directory. - ${dumpAttrs 0 newChannels} - ''; -} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/update.py b/pkgs/applications/networking/browsers/ungoogled-chromium/update.py new file mode 100755 index 0000000000000..bfc7f0d2478c3 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/update.py @@ -0,0 +1,77 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python -p python3 nix + +import csv +import json +import subprocess +import sys + +from codecs import iterdecode +from collections import OrderedDict +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() + +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 + + 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/update.sh b/pkgs/applications/networking/browsers/ungoogled-chromium/update.sh deleted file mode 100755 index ea67a62c107a2..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/update.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -e -cd "$(dirname "$0")" -sp="$(nix-build --builders "" -Q --no-out-link update.nix -A update)" -cat "$sp" > upstream-info.nix diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json new file mode 100644 index 0000000000000..dae7f741b3576 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json @@ -0,0 +1,17 @@ +{ + "stable": { + "version": "85.0.4183.102", + "sha256": "032yh1mfwins7a62zw8kwwq8xw1n52a0a93lqz7qlyjaf9sd8s4a", + "sha256bin64": "1i8xaxxnmg80vsia8hxnq58qi9k5nnbrl80d6d23g9lb7dbc9cpm" + }, + "beta": { + "version": "86.0.4240.30", + "sha256": "1isj0zngb72k1hhn3h0s8mccg1cdmppz1mjmg19f2h306farzmzl", + "sha256bin64": "10d8im2adqqnkd6265gngv6xlm5qsz6r13z6cbbchsss0ssr8fxa" + }, + "dev": { + "version": "87.0.4252.0", + "sha256": "1lxlsdni63zh79hxvpwgmnfn67kgfzhz3yg9bkxghqchqykkz92y", + "sha256bin64": "130hf7b35wcxpw05ddbqq89x10c0kays1vb9qg6xhq3zx2mk6ijw" + } +} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix deleted file mode 100644 index 874e45307ebfa..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file is autogenerated from update.sh in the same directory. -{ - beta = { - sha256 = "0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp"; - sha256bin64 = "017ix9a74f2gzlg6in0x6fqgiw8bpk0rypr6wsqqkslywprypjd0"; - version = "84.0.4147.89"; - }; - dev = { - sha256 = "1dbbr7s8vbhxd0sk4k2yqp630zp1r4gzkkd2a86pzlzq2mjhsk8a"; - sha256bin64 = "0bphfwi6nkj9nzrjjaffiv27xfblgdikyifsbjl6vv2pawkh335q"; - version = "85.0.4183.15"; - }; - stable = { - sha256 = "0yf6j0459qzr677zsa2apmfz0x0ndlscvwj1a5v40nqjijchv5qp"; - sha256bin64 = "1hzhgvs2ykqsncpnbnhzh09sw1vlsdfjhs06z5gc80l47brdi3wz"; - version = "84.0.4147.89"; - }; -} diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 11eb24ff70313..3dd9fe2c4f892 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -3,7 +3,7 @@ stdenv , makeWrapper , makeDesktopItem , fetchurl -, jre +, jdk8 }: let @@ -31,7 +31,7 @@ let buildInputs = [ makeWrapper ]; installPhase = '' - makeWrapper ${jre}/bin/java $out/bin/charles \ + makeWrapper ${jdk8.jre}/bin/java $out/bin/charles \ --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar" for fn in lib/*.jar; do diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index f29508ffe3800..a6d9278f58b0b 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -132,8 +132,8 @@ in rec { }); terraform_0_13 = pluggable (generic { - version = "0.13.2"; - sha256 = "04pm57l29j3ai6dvh2343q4yhskkxqj8ayr2hdw2qqjch52p8mrw"; + version = "0.13.3"; + sha256 = "1bjgsabkyh3xf4gdp41mwhw6bpmjg45bnq2hk522glk02n2xngpw"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 70e107c063fb5..8fb14ae3b147f 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchFromGitHub, buildGoPackage}: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "dnscontrol"; - version = "3.2.0"; - - goPackagePath = "github.com/StackExchange/dnscontrol"; + version = "3.3.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "1lrn1whmx9zkyvs505zxrsmnr5s6kpj3kjkr6rblfwdlnadkgfj7"; + sha256 = "0lldkx906imwm8mxcfafpanbgaqh0sdm3zdkwkn7j0nmngyncx9p"; }; + vendorSha256 = "16cc6hb2iwh1zwrrnb7s4dqxqhaj67gq3gfr5xvh5kqafd685hvx"; + subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Synchronize your DNS to multiple providers from a simple DSL"; homepage = "https://stackexchange.github.io/dnscontrol/"; license = licenses.mit; - maintainers = with maintainers; [ mmahut ]; + maintainers = with maintainers; [ mmahut SuperSandro2000 ]; }; } diff --git a/pkgs/applications/networking/gnome-network-displays/default.nix b/pkgs/applications/networking/gnome-network-displays/default.nix new file mode 100644 index 0000000000000..80fbb6dd6e747 --- /dev/null +++ b/pkgs/applications/networking/gnome-network-displays/default.nix @@ -0,0 +1,82 @@ +{ stdenv +, fetchurl +, fetchpatch +# native +, meson +, ninja +, pkg-config +, gettext +, desktop-file-utils +, appstream-glib +, wrapGAppsHook +, python3 +# Not native +, gst_all_1 +, gsettings-desktop-schemas +, gtk3 +, glib +, networkmanager +, libpulseaudio +}: + +stdenv.mkDerivation rec { + pname = "gnome-network-displays"; + version = "0.90.4"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "04snnfz5jxxpjkrwa7dchc2h4shszi8mq9g3ihvsvipgzjw3d498"; + }; + + patches = [ + # Undeclared dependency on gio-unix-2.0, see: + # https://github.com/NixOS/nixpkgs/issues/36468 and + # https://gitlab.gnome.org/GNOME/gnome-network-displays/-/merge_requests/147 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-network-displays/-/commit/ef3f3ff565acd8238da46de604a1e750d4f02f07.diff"; + sha256 = "1ljiwgqia6am4lansg70qnwkch9mp1fr6bga98s5fwyiaw6b6f4p"; + }) + # Fixes an upstream bug: https://gitlab.gnome.org/GNOME/gnome-network-displays/-/issues/147 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-network-displays/-/commit/23164b58f4d5dd59de988525906d6e5e82c5a63c.patch"; + sha256 = "0x32dvkzv9m04q41aicscpf4aspghx81a65462kjqnsavi64lga5"; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + desktop-file-utils + appstream-glib + wrapGAppsHook + python3 + ]; + + buildInputs = [ + gtk3 + glib + gsettings-desktop-schemas + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gst-rtsp-server + networkmanager + libpulseaudio + ]; + + preConfigure = '' + patchShebangs ./build-aux/meson/postinstall.py + ''; + + meta = with stdenv.lib; { + homepage = "https://gitlab.gnome.org/GNOME/gnome-network-displays"; + description = "Miracast implementation for GNOME"; + maintainers = with maintainers; [ doronbehar ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 63bcc58ac3ebf..938be9a9778d8 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -1,8 +1,9 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk +{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk8 # Optional, Jitsi still runs without, but you may pass null: , alsaLib, dbus, gtk2, libpulseaudio, openssl, xorg }: +let jdk = jdk8; in stdenv.mkDerivation rec { pname = "jitsi"; version = "2.10.5550"; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index dc8fc81d35e25..881d7458c096d 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -4,7 +4,7 @@ , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib , cups, expat, libuuid, at-spi2-core, libappindicator-gtk3 # Runtime dependencies: -, systemd, libnotify, libdbusmenu +, systemd, libnotify, libdbusmenu, libpulseaudio # Unfortunately this also overwrites the UI language (not just the spell # checking language!): , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" @@ -122,6 +122,7 @@ in stdenv.mkDerivation rec { --replace /opt/Signal/signal-desktop $out/bin/signal-desktop autoPatchelf --no-recurse -- $out/lib/Signal/ + patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc.node ''; # Tests if the application launches and waits for "Link your phone to Signal Desktop": diff --git a/pkgs/applications/networking/instant-messengers/sky/default.nix b/pkgs/applications/networking/instant-messengers/sky/default.nix deleted file mode 100644 index 33bd4586bfdb6..0000000000000 --- a/pkgs/applications/networking/instant-messengers/sky/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchurl, file, libX11, libXScrnSaver -, libGL, qt5, SDL, libpulseaudio -, libXrandr, libXext, libXcursor, libXinerama, libXi -, curl, sqlite, openssl -, libuuid, openh264, libv4l, libxkbfile, libXv, zlib, libXmu -, libXtst, libXdamage, pam, libXfixes, libXrender, libjpeg_original -, ffmpeg_3 -}: - let - # Sky is linked to the libjpeg 8 version and checks for the version number in the code. - libjpeg_original_fix = libjpeg_original.overrideAttrs (oldAttrs: { - src = fetchurl{ - url = "https://www.ijg.org/files/jpegsrc.v8d.tar.gz"; - sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"; - }; - }); -in -stdenv.mkDerivation rec { - version_major = "2.1.7369"; - version_minor = "1"; - version = version_major + "." + version_minor; - pname = "sky"; - unpackCmd = "ar x $curSrc; tar -xf data.tar.xz"; - src = fetchurl { - url = "https://tel.red/repos/ubuntu/pool/non-free/sky_${version_major + "-" + version_minor}ubuntu+xenial_amd64.deb"; - sha256 = "0b3j90km3rp5bgaklxw881g0gcy09mqzbhjdfrq4s2np026ql3d9"; - }; - buildInputs = [ - file - qt5.qtbase - SDL - ffmpeg_3 - sqlite - openssl - openh264 - pam - curl - libX11 libXScrnSaver libGL libpulseaudio libXrandr - libXext libXcursor libXinerama libXi libuuid libv4l - libxkbfile libXv zlib libXmu libXtst libXdamage - libXfixes libXrender - libjpeg_original_fix - ]; - dontBuild = true; - - installPhase = '' - ls -al ./ - mkdir -p "$out/bin" "$out/lib" "$out/share" - cp -a lib/sky/* $out/bin/ - cp -aR lib/sky/lib64/* "$out/lib/" - cp -a lib/sky/man.sh "$out/bin" - chmod +x $out/bin/sky - cp -a share/* "$out/share" - '' - ; - - - postFixup = '' - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libfreerdp-client.so.2.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libfreerdp-server.so.2.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libfreerdp-shadow.so.2.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libfreerdp.so.2.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libopenh264.so.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/librdtk.so.1.1.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libSDL-1.3.so.0.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libsipw.so.1.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libwinpr.so.1.1.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} $out/lib/libxfreerdp-client.so.2.0.0 - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/sky - patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}:${stdenv.lib.makeLibraryPath buildInputs} --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/sky_sender - sed -i "s#/usr/bin/sky#$out/bin/sky#g" $out/share/applications/sky.desktop - sed -i "s#/usr/lib/sky#$out/bin/#g" $out/share/applications/sky.desktop - ''; - - meta = with stdenv.lib; { - description = "Skype for business"; - longDescription = '' - Lync & Skype for business on linux - ''; - homepage = "https://tel.red/"; - license = licenses.unfree; - maintainers = [ maintainers.Scriptkiddi ]; - platforms = platforms.unix; - }; -} - diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix index 52d4d77a40091..51f6b4e062298 100644 --- a/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -18,10 +18,16 @@ , qtwebkit , qttranslations , substituteAll -, withI18n ? true +, withI18n ? false }: -mkDerivation rec { +let + l10n = fetchsvn { + url = "svn://anonsvn.kde.org/home/kde/trunk/l10n-kf5"; + rev = "1566642"; + sha256 = "0y45fjib153za085la3hqpryycx33dkj3cz8kwzn2w31kvldfl1q"; + }; +in mkDerivation rec { pname = "trojita"; version = "unstable-2020-07-06"; @@ -31,12 +37,6 @@ mkDerivation rec { sha256 = "0r8nmlqwgsqkk0k8xh32fkwvv6iylj35xq2h8b7l3g03yc342kbn"; }; - l10n = fetchsvn { - url = "svn://anonsvn.kde.org/home/kde/trunk/l10n-kf5"; - rev = "1566642"; - sha256 = "0y45fjib153za085la3hqpryycx33dkj3cz8kwzn2w31kvldfl1q"; - }; - patches = (substituteAll { # See https://github.com/NixOS/nixpkgs/issues/86054 src = ./fix-qttranslations-path.patch; diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index c2ccbabe2f161..6438bed482851 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "LUA_INCLUDE=${lua52Packages.lua}/include" "LUA_LIB=${lua52Packages.lua}/lib/liblua.so" + "OBJDIR=$TMP/wg-build" ]; preBuild = stdenv.lib.optionalString stdenv.isLinux '' diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/applications/science/biology/truvari/default.nix index e64c9d3493e98..84cc9909a48dc 100644 --- a/pkgs/applications/science/biology/truvari/default.nix +++ b/pkgs/applications/science/biology/truvari/default.nix @@ -25,13 +25,15 @@ python3Packages.buildPythonApplication rec { prePatch = '' substituteInPlace ./setup.py \ - --replace '"progressbar2==3.41.0",' '"progressbar2==3.47.0",' \ - --replace '"pysam==0.15.2",' '"pysam==0.15.4",' \ - --replace '"pyfaidx==0.5.5.2",' '"pyfaidx==0.5.8",' + --replace '"progressbar2==3.41.0",' '"progressbar2",' \ + --replace '"pysam==0.15.2",' '"pysam",' \ + --replace '"pyfaidx==0.5.5.2",' '"pyfaidx",' \ + --replace '"intervaltree==3.0.2",' '"intervaltree",' ''; meta = with lib; { description = "Structural variant comparison tool for VCFs"; + homepage = "https://github.com/spiralgenetics/truvari"; license = licenses.mit; maintainers = with maintainers; [ scalavision ]; longDescription = '' diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/applications/science/electronics/kicad/libraries.nix index 91ce30de5f020..057bc15bf5f3a 100644 --- a/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/pkgs/applications/science/electronics/kicad/libraries.nix @@ -62,8 +62,7 @@ in inherit name; } // (libSources.${name} or { }) ); - buildInputs = [ gettext ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake gettext ]; meta = { license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3 platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 9c59ad3a394bd..ce8ebe42ea874 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.040"; + version = "4.100"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "1qy0wllsmxva3c838spxwmacxx36r3njxwhgp172m4l3829785bf"; + sha256 = "0vg1gk1hqlnz74gfpf57588758myxvhqzi37yl4vqjcq40r83nr2"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/pkgs/applications/science/logic/leo3/binary.nix index dcea9c27acb41..29a9adf94c4b7 100644 --- a/pkgs/applications/science/logic/leo3/binary.nix +++ b/pkgs/applications/science/logic/leo3/binary.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { mkdir -p "$out"/{bin,lib/java/leo3} cp "${jar}" "$out/lib/java/leo3/leo3.jar" echo "#!${runtimeShell}" > "$out/bin/leo3" - echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" > "$out/bin/leo3" + echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" >> "$out/bin/leo3" chmod a+x "$out/bin/leo3" ''; diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/applications/science/machine-learning/streamlit/default.nix index 3856b8ec841ac..26b241ff0ada9 100644 --- a/pkgs/applications/science/machine-learning/streamlit/default.nix +++ b/pkgs/applications/science/machine-learning/streamlit/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonApplication, fetchPypi , altair, astor, base58, blinker, boto3, botocore, click, enum-compat - , future, pillow, protobuf, requests, toml, tornado, tzlocal, validators, watchdog + , future, pillow, protobuf, requests, toml, tornado_5, tzlocal, validators, watchdog , jinja2, setuptools }: @@ -16,7 +16,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ altair astor base58 blinker boto3 botocore click enum-compat - future pillow protobuf requests toml tornado tzlocal validators watchdog + future pillow protobuf requests toml tornado_5 tzlocal validators watchdog jinja2 setuptools ]; diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index 626e1bf1ea92e..ba7f6ccd18b5d 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -50,7 +50,7 @@ , zlib , gsl , ntl -, jdk +, jdk8 , less }: @@ -61,6 +61,8 @@ assert (!blas.isILP64) && (!lapack.isILP64); # dependencies. let + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + runtimepath = (lib.makeBinPath ([ "@sage-local@" "@sage-local@/build" diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 09d50d5a11c81..13fe6cf4ef8d6 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,20 +2,21 @@ buildGoModule rec { pname = "gh"; - version = "0.12.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "1nwpqwr8sqqpndj7qsk935i1675f4qdbl31x60a038l9iiwc28x1"; + sha256 = "10ixjrb56ddqxla7mfxqnf74zissjx66akcyvgl9xfmww0bvg64x"; }; - vendorSha256 = "1m5ahzh5sfla3p6hllr7wjigvrnccdvrsdjpxd2hy0rl7jsrp85m"; + vendorSha256 = "079zbm57xfcskwhsfj1x0c0lg6ip6c6dbk8hfwrzkpy8gfs2ysmr"; nativeBuildInputs = [ installShellFiles ]; buildPhase = '' + export GO_LDFLAGS="-s -w" make GH_VERSION=${version} bin/gh manpages ''; 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 a7d8080708eba..cbb69403531e8 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.4"; + version = "2.15.6"; src = fetchPypi { inherit pname version; - sha256 = "0n2lrsjs3flfv7650yfhck1c96wkn41cv49440m7csy5yw16zlim"; + sha256 = "0ajb3m3i3pfc5v3gshglk7qphk1rpniwx8q8isgx1a6cyarzr9bd"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index d0853f339786a..5e2fdc087fe35 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/gitolite-shell \ - --prefix PATH : "${git}/bin" + --prefix PATH : ${lib.makeBinPath [ git perl ]} ''; installPhase = '' diff --git a/pkgs/applications/version-management/gomp/default.nix b/pkgs/applications/version-management/gomp/default.nix new file mode 100644 index 0000000000000..efdef3b967f8c --- /dev/null +++ b/pkgs/applications/version-management/gomp/default.nix @@ -0,0 +1,23 @@ +{ lib +, python3Packages + }: + +python3Packages.buildPythonApplication rec { + pname = "gomp"; + version = "1.1.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "11nq40igqbyfiygdzb1zyxx1n6d9xkv8vlmprbbi75mq54gfihhb"; + }; + + doCheck = false; # tests require interactive terminal + + meta = with lib; { + description = "A tool for comparing Git branches"; + homepage = "https://github.com/MarkForged/GOMP"; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index 80a30852daeec..ca9ecb48188c3 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "celluloid"; - version = "0.19"; + version = "0.20"; src = fetchFromGitHub { owner = "celluloid-player"; repo = "celluloid"; rev = "v${version}"; - sha256 = "1jdmwljckajqb3ys8azd1nyy49nvq9kb2knrrqdcfnvzq0m5lpqr"; + hash = "sha256-fEZnH8EqU6CykgKINXnKChuBUlisroa97B1vjcx2cWA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix new file mode 100644 index 0000000000000..cdd70b4c8948b --- /dev/null +++ b/pkgs/applications/video/filebot/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, openjdk11, makeWrapper, autoPatchelfHook +, zlib, libzen, libmediainfo, curl, libmms, glib +}: + +let + # FileBot requires libcurl-gnutls.so to build + curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; + +in + +stdenv.mkDerivation rec { + pname = "filebot"; + version = "4.9.1"; + + src = fetchurl { + url = "https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; + sha256 = "0l496cz703mjymjhgmyrkqbfld1bz53pdsbkx00h9a267j22fkms"; + }; + + unpackPhase = "tar xvf $src"; + + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; + + buildInputs = [ zlib libzen libmediainfo curlWithGnuTls libmms glib ]; + + dontBuild = true; + installPhase = '' + mkdir -p $out/opt $out/bin + # Since FileBot has dependencies on relative paths between files, all required files are copied to the same location as is. + cp -r filebot.sh lib/ jar/ $out/opt/ + # Filebot writes to $APP_DATA, which fails due to read-only filesystem. Using current user .local directory instead. + substituteInPlace $out/opt/filebot.sh \ + --replace 'APP_DATA="$FILEBOT_HOME/data/$USER"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \ + --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license' + wrapProgram $out/opt/filebot.sh \ + --prefix PATH : ${stdenv.lib.makeBinPath [ openjdk11 ]} + # Expose the binary in bin to make runnable. + ln -s $out/opt/filebot.sh $out/bin/filebot + ''; + + meta = with stdenv.lib; { + description = "The ultimate TV and Movie Renamer"; + longDescription = '' + FileBot is the ultimate tool for organizing and renaming your Movies, TV + Shows and Anime as well as fetching subtitles and artwork. It's smart and + just works. + ''; + homepage = "https://filebot.net"; + changelog = "https://www.filebot.net/forums/viewforum.php?f=7"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ gleber felschr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 9b2c8f83577ed..fa68c58f5af10 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv, drake , ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost, libebml, zlib -, fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark +, fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark, pcre2 , withGUI ? true , qtbase ? null , qtmultimedia ? null @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "48.0.0"; + version = "50.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0lbl3w2m12blymda3m00afl9racgahvl0z4b2clwbawhvypc5vfc"; + sha256 = "001i206lwxjyrp406svv4zpb1pliac3f4k5zhzgkjbk2dzj85pyd"; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat file xdg_utils boost libebml zlib fmt - libmatroska libogg libvorbis flac cmark + libmatroska libogg libvorbis flac cmark pcre2 ] ++ optional stdenv.isDarwin libiconv ++ optionals withGUI [ qtbase qtmultimedia wrapQtAppsHook ]; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index d0c8938e6def2..54ffb036f3c38 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.18.3"; + version = "1.19.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "1csdbyypqwxkfc061pdv7nj52a52b9xxzb6qgxcznd82w7wgfb3g"; + sha256 = "1lrr8y0k6609z4gb8cg277rq58sh0bqd2b4mzjlynyjdgp3xskfq"; }; vendorSha256 = null; @@ -41,10 +41,6 @@ buildGoModule rec { BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub"; buildPhase = '' - patchShebangs . - - sed -i '/version.buildDate/d' Makefile - make binaries docs BUILDTAGS="$BUILDTAGS" ''; diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix index 298bec6550e5a..6d72623d86cbf 100644 --- a/pkgs/applications/virtualization/cri-o/wrapper.nix +++ b/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -10,7 +10,6 @@ , utillinux # nsenter , cni-plugins # not added to path , iptables -, socat }: let @@ -22,7 +21,6 @@ let conmon utillinux iptables - socat ] ++ extraPackages); in runCommand cri-o.name { diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 78d6631c2dc0c..14cfa7b3120cb 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -79,7 +79,7 @@ rec { sha256 = sha256; }; - patches = [ + patches = lib.optional (versionAtLeast version "19.03") [ # Replace hard-coded cross-compiler with $CC (fetchpatch { url = https://github.com/docker/docker-ce/commit/2fdfb4404ab811cb00227a3de111437b829e55cf.patch; diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 1aab26532a4f9..786f0f9c5983f 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -311,7 +311,7 @@ stdenv.mkDerivation { substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh - substituteAll ${if stdenv.isDarwin then ../wrapper-common/utils.bash.darwin else ../wrapper-common/utils.bash} $out/nix-support/utils.bash + substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash '' ## diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 30d3db1866cf7..0e4e76d72843a 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -459,7 +459,7 @@ stdenv.mkDerivation { substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh - substituteAll ${if stdenv.isDarwin then ../wrapper-common/utils.bash.darwin else ../wrapper-common/utils.bash} $out/nix-support/utils.bash + substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash '' ## diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index d3f7d382c19a7..5714b228c595c 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -15,6 +15,8 @@ if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" fi +cInclude=0 + source @out@/nix-support/utils.bash # Flirting with a layer violation here. diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnetenv/build-solution.nix index 62370d361cd02..57af1fe9bd49c 100644 --- a/pkgs/build-support/dotnetenv/build-solution.nix +++ b/pkgs/build-support/dotnetenv/build-solution.nix @@ -16,20 +16,20 @@ assert modifyPublicMain -> mainClassFile != null; stdenv.mkDerivation { inherit name src; - - buildInputs = [ dotnetfx ]; + + buildInputs = [ dotnetfx ]; preConfigure = '' cd ${baseDir} ''; - + preBuild = '' ${stdenv.lib.optionalString modifyPublicMain '' sed -i -e "s|static void Main|public static void Main|" ${mainClassFile} ''} ${preBuild} ''; - + installPhase = '' addDeps() { @@ -39,44 +39,44 @@ stdenv.mkDerivation { do windowsPath=$(cygpath --windows $i) assemblySearchPaths="$assemblySearchPaths;$windowsPath" - + addDeps $i done fi } - + for i in ${toString assemblyInputs} do - windowsPath=$(cygpath --windows $i) + windowsPath=$(cygpath --windows $i) echo "Using assembly path: $windowsPath" - + if [ "$assemblySearchPaths" = "" ] then assemblySearchPaths="$windowsPath" else assemblySearchPaths="$assemblySearchPaths;$windowsPath" fi - + addDeps $i done - + echo "Assembly search paths are: $assemblySearchPaths" - + if [ "$assemblySearchPaths" != "" ] then echo "Using assembly search paths args: $assemblySearchPathsArg" export AssemblySearchPaths=$assemblySearchPaths fi - + mkdir -p $out MSBuild.exe ${toString slnFile} /nologo /t:${targets} /p:IntermediateOutputPath=$(cygpath --windows $out)\\ /p:OutputPath=$(cygpath --windows $out)\\ /verbosity:${verbosity} ${options} - + # Because .NET assemblies store strings as UTF-16 internally, we cannot detect # hashes. Therefore a text files containing the proper paths is created # We can also use this file the propagate transitive dependencies. - + mkdir -p $out/nix-support - + for i in ${toString assemblyInputs} do echo $i >> $out/nix-support/dotnet-assemblies diff --git a/pkgs/build-support/dotnetenv/default.nix b/pkgs/build-support/dotnetenv/default.nix index 781a5ba8c0ee9..c7145504eb7bf 100644 --- a/pkgs/build-support/dotnetenv/default.nix +++ b/pkgs/build-support/dotnetenv/default.nix @@ -10,7 +10,7 @@ let dotnetenv = buildWrapper = import ./wrapper.nix { inherit dotnetenv; }; - + inherit (dotnetfx) assembly20Path wcfPath referenceAssembly30Path referenceAssembly35Path; }; in diff --git a/pkgs/build-support/dotnetenv/wrapper.nix b/pkgs/build-support/dotnetenv/wrapper.nix index 4b07fc27dcb00..423303c3084a1 100644 --- a/pkgs/build-support/dotnetenv/wrapper.nix +++ b/pkgs/build-support/dotnetenv/wrapper.nix @@ -36,25 +36,25 @@ dotnetenv.buildSolution { do windowsPath=$(cygpath --windows $i | sed 's|\\|\\\\|g') assemblySearchArray="$assemblySearchArray @\"$windowsPath\"" - + addRuntimeDeps $i done fi } - + export exePath=$(cygpath --windows $(find ${application} -name \*.exe) | sed 's|\\|\\\\|g') - + # Generate assemblySearchPaths string array contents for path in ${toString assemblyInputs} do assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\", " addRuntimeDeps $path done - + sed -e "s|@ROOTNAMESPACE@|${namespace}Wrapper|" \ -e "s|@ASSEMBLYNAME@|${namespace}|" \ Wrapper/Wrapper.csproj.in > Wrapper/Wrapper.csproj - + sed -e "s|@NAMESPACE@|${namespace}|g" \ -e "s|@MAINCLASSNAME@|${mainClassName}|g" \ -e "s|@EXEPATH@|$exePath|g" \ diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index b1b9325ea6e53..e01df107dd17f 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation { + '' substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh - substituteAll ${if stdenv.isDarwin then ../wrapper-common/utils.bash.darwin else ../wrapper-common/utils.bash} $out/nix-support/utils.bash + substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash '' ## diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index f270fe97326c1..23fb56539e45c 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation (args // { echo echo "To fix the issue:" echo '1. Use "0000000000000000000000000000000000000000000000000000" as the cargoSha256 value' - echo "2. Build the derivation and wait it to fail with a hash mismatch" + echo "2. Build the derivation and wait for it to fail with a hash mismatch" echo "3. Copy the 'got: sha256:' value back into the cargoSha256 field" echo diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index f1d4808e3ccec..d937ec6266820 100644 --- a/pkgs/build-support/singularity-tools/default.nix +++ b/pkgs/build-support/singularity-tools/default.nix @@ -86,7 +86,9 @@ rec { done # Create runScript and link shell - ln -s ${runtimeShell} bin/sh + if [ ! -e bin/sh ]; then + ln -s ${runtimeShell} bin/sh + fi mkdir -p .singularity.d ln -s ${runScriptFile} .singularity.d/runscript diff --git a/pkgs/build-support/wrapper-common/utils.bash b/pkgs/build-support/wrapper-common/utils.bash index ce569ac2b8c4d..8c4680a8e4460 100644 --- a/pkgs/build-support/wrapper-common/utils.bash +++ b/pkgs/build-support/wrapper-common/utils.bash @@ -69,9 +69,9 @@ badPath() { # directory (including the build directory). test \ "$p" != "/dev/null" -a \ - "${p#${NIX_STORE}}" = "$p" -a \ - "${p#${TMP:-/tmp}}" = "$p" -a \ - "${p#${NIX_BUILD_TOP}}" = "$p" + "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \ + "${p:0:4}" != "/tmp" -a \ + "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP" } expandResponseParams() { diff --git a/pkgs/build-support/wrapper-common/utils.bash.darwin b/pkgs/build-support/wrapper-common/utils.bash.darwin deleted file mode 100644 index 8c4680a8e4460..0000000000000 --- a/pkgs/build-support/wrapper-common/utils.bash.darwin +++ /dev/null @@ -1,92 +0,0 @@ -# Accumulate suffixes for taking in the right input parameters with the `mangle*` -# functions below. See setup-hook for details. -accumulateRoles() { - declare -ga role_suffixes=() - if [ "${NIX_@wrapperName@_TARGET_BUILD_@suffixSalt@:-}" ]; then - role_suffixes+=('_FOR_BUILD') - fi - if [ "${NIX_@wrapperName@_TARGET_HOST_@suffixSalt@:-}" ]; then - role_suffixes+=('') - fi - if [ "${NIX_@wrapperName@_TARGET_TARGET_@suffixSalt@:-}" ]; then - role_suffixes+=('_FOR_TARGET') - fi -} - -mangleVarList() { - local var="$1" - shift - local -a role_suffixes=("$@") - - local outputVar="${var}_@suffixSalt@" - declare -gx ${outputVar}+='' - # For each role we serve, we accumulate the input parameters into our own - # cc-wrapper-derivation-specific environment variables. - for suffix in "${role_suffixes[@]}"; do - local inputVar="${var}${suffix}" - if [ -v "$inputVar" ]; then - export ${outputVar}+="${!outputVar:+ }${!inputVar}" - fi - done -} - -mangleVarBool() { - local var="$1" - shift - local -a role_suffixes=("$@") - - local outputVar="${var}_@suffixSalt@" - declare -gxi ${outputVar}+=0 - for suffix in "${role_suffixes[@]}"; do - local inputVar="${var}${suffix}" - if [ -v "$inputVar" ]; then - # "1" in the end makes `let` return success error code when - # expression itself evaluates to zero. - # We don't use `|| true` because that would silence actual - # syntax errors from bad variable values. - let "${outputVar} |= ${!inputVar:-0}" "1" - fi - done -} - -skip () { - if (( "${NIX_DEBUG:-0}" >= 1 )); then - echo "skipping impure path $1" >&2 - fi -} - - -# Checks whether a path is impure. E.g., `/lib/foo.so' is impure, but -# `/nix/store/.../lib/foo.so' isn't. -badPath() { - local p=$1 - - # Relative paths are okay (since they're presumably relative to - # the temporary build directory). - if [ "${p:0:1}" != / ]; then return 1; fi - - # Otherwise, the path should refer to the store or some temporary - # directory (including the build directory). - test \ - "$p" != "/dev/null" -a \ - "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \ - "${p:0:4}" != "/tmp" -a \ - "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP" -} - -expandResponseParams() { - declare -ga params=("$@") - local arg - for arg in "$@"; do - if [[ "$arg" == @* ]]; then - # phase separation makes this look useless - # shellcheck disable=SC2157 - if [ -x "@expandResponseParams@" ]; then - # params is used by caller - #shellcheck disable=SC2034 - readarray -d '' params < <("@expandResponseParams@" "$@") - return 0 - fi - fi - done -} diff --git a/pkgs/data/fonts/3270font/default.nix b/pkgs/data/fonts/3270font/default.nix index 3338b77841596..a972bd7c3d8b4 100644 --- a/pkgs/data/fonts/3270font/default.nix +++ b/pkgs/data/fonts/3270font/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2.0.4"; + version = "2.1.0"; in -fetchzip rec { +fetchzip { name = "3270font-${version}"; - url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_ece94f6.zip"; + url = "https://github.com/rbanffy/3270font/releases/download/v.${version}/3270_fonts_fba25eb.zip"; - sha256 = "04q7dnrlq5hm30iibh3jafb33m5lwsgb3g9n9i188sg02ydkrsl9"; + sha256 = "04xqgiznd6d3c1rdbbdmd87rjy9bnhh00lm8xzmal1zidcr2g0n9"; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index e4107cd4b9980..ed28f6b5e6ce4 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0baadsrgpqj15fgjmcn0aim0k0nk7mvivcxinw1zwg61kkcwhalx"; + outputHash = "089d2m9bvaacj36qdq77pcazji0sbbr796shic3k52cpxkjnzbwh"; meta = with stdenv.lib; { homepage = "http://corefonts.sourceforge.net/"; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 40a6c88743937..79f8cb8b336b7 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -111,18 +111,18 @@ in }; noto-fonts-emoji = let - version = "unstable-2020-08-20"; + version = "2020-09-16-unicode13_1"; emojiPythonEnv = python3.withPackages (p: with p; [ fonttools nototools ]); in stdenv.mkDerivation { pname = "noto-fonts-emoji"; - inherit version; + version = builtins.replaceStrings [ "_" ] [ "." ] version; src = fetchFromGitHub { owner = "googlefonts"; repo = "noto-emoji"; - rev = "1bc491419fa2925d018f27bfe702792031be0e68"; - sha256 = "1vak4s1p4wlwzpnqfb1c2sg62q82gnjpnmqrfz8xl6bd0z55imzy"; + rev = "v${version}"; + sha256 = "0659336dp0l2nkac153jpcb9yvp0p3dx1crcyxjd14i8cqkfi2hh"; }; nativeBuildInputs = [ diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index 6ea26f7c79d84..f5bd6335dfbb6 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "nototools"; - version = "0.2.12"; + version = "0.2.13"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "nototools"; rev = "v${version}"; - sha256 = "0drmx1asni3g6616fa4gjn5n43qkcf7icvxq9y2krpjxq78wcmc5"; + sha256 = "0ggp65xgkf9y7jamncm65lkm84wapsa47abf133pcb702875v8jz"; }; postPatch = '' diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index 5c6a64b1f33d3..80b4eb58ab579 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -8,6 +8,7 @@ #### APPLICATIONS econnman = callPackage ./econnman { }; + evisum = callPackage ./evisum { }; terminology = callPackage ./terminology { }; rage = callPackage ./rage { }; ephoto = callPackage ./ephoto { }; diff --git a/pkgs/desktops/enlightenment/evisum/default.nix b/pkgs/desktops/enlightenment/evisum/default.nix new file mode 100644 index 0000000000000..7b97d871e60b5 --- /dev/null +++ b/pkgs/desktops/enlightenment/evisum/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, meson, ninja, pkg-config, efl }: + +stdenv.mkDerivation rec { + pname = "evisum"; + version = "0.5.6"; + + src = fetchurl { + url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1l8pym7738kncvic5ga03sj9d5igigvmcxa9lbg47z2yvdjwzv97"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + efl + ]; + + meta = with stdenv.lib; { + description = "System and process monitor written with EFL"; + homepage = "https://www.enlightenment.org"; + license = with licenses; [ isc ]; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index 53f8d9e79a0e3..98827fd3f6a2a 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-gsconnect"; - version = "39"; + version = "41"; src = fetchFromGitHub { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "0d2wypf36p95v756arf06gfilpb48gp55i1xbqnqvcd10n3q4zc2"; + sha256 = "0lcj7k16jki54bsyh01j4ss4hhfddnahcw02zlmlkl637qdv1b5j"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch index 629d34b6f68a5..58c02a92eb2ef 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch @@ -1,5 +1,7 @@ ---- a/data/org.gnome.Shell.Extensions.GSConnect.desktop -+++ b/data/org.gnome.Shell.Extensions.GSConnect.desktop +diff --git i/data/org.gnome.Shell.Extensions.GSConnect.desktop.in w/data/org.gnome.Shell.Extensions.GSConnect.desktop.in +index ffb23342..b405c73b 100644 +--- i/data/org.gnome.Shell.Extensions.GSConnect.desktop.in ++++ w/data/org.gnome.Shell.Extensions.GSConnect.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application @@ -9,18 +11,22 @@ Terminal=false NoDisplay=true Icon=org.gnome.Shell.Extensions.GSConnect ---- a/src/extension.js -+++ b/src/extension.js +diff --git i/src/extension.js w/src/extension.js +index 5f32aa68..872c0c61 100644 +--- i/src/extension.js ++++ w/src/extension.js @@ -1,5 +1,7 @@ 'use strict'; +'@typelibPath@'.split(':').forEach(path => imports.gi.GIRepository.Repository.prepend_search_path(path)); + const Gio = imports.gi.Gio; - const GLib = imports.gi.GLib; + const GObject = imports.gi.GObject; const Gtk = imports.gi.Gtk; ---- a/src/prefs.js -+++ b/src/prefs.js +diff --git i/src/prefs.js w/src/prefs.js +index 07e93099..1c166710 100644 +--- i/src/prefs.js ++++ w/src/prefs.js @@ -1,5 +1,7 @@ 'use strict'; diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix index f9fc68b548a28..f1c53eda6bdf1 100644 --- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix +++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-timepp"; - version = "unstable-2019-03-30"; + version = "unstable-2020-03-15"; src = fetchFromGitHub { owner = "zagortenay333"; repo = "timepp__gnome"; - rev = "f90fb5573b37ac89fb57bf62e07d6d3bdb6a2c63"; - sha256 = "0p6rsbm6lf61vzly775qkwc2rcjjl38bkqdxnv4sccqmw2wwclnp"; + rev = "34ae477a51267cc1e85992a80cf85a1a7b7005c1"; + sha256 = "1v0xbrp0x5dwizscxh7h984pax4n92bj8iyw3qvjk27ynpxq8ag1"; }; uuid = "timepp@zagortenay333"; @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/zagortenay333/timepp__gnome"; license = licenses.gpl3; maintainers = with maintainers; [ svsdep ]; - broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Dosen't support 3.34 https://github.com/zagortenay333/timepp__gnome/issues/113 }; } diff --git a/pkgs/development/compilers/jasmin/default.nix b/pkgs/development/compilers/jasmin/default.nix index ef1b3055190ed..7defdc5c689b8 100644 --- a/pkgs/development/compilers/jasmin/default.nix +++ b/pkgs/development/compilers/jasmin/default.nix @@ -1,13 +1,13 @@ { stdenv , fetchurl , unzip -, jdk +, jdk8 , ant , makeWrapper -, jre , callPackage }: +let jre = jdk8.jre; jdk = jdk8; in stdenv.mkDerivation rec { pname = "jasmin"; version = "2.4"; diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index e0698e1dcf3dd..e827f76231f11 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , cmake , zlib , ncurses @@ -20,6 +21,15 @@ stdenv.mkDerivation { src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq"; + patches = [ + # Fix PythonString::GetString for >=python-3.7 + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5457b426f5e15a29c0acc8af1a476132f8be2a36.patch"; + sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps"; + stripLen = 1; + }) + ]; + postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix index 80e298eaf8c0c..629749e10f3c4 100644 --- a/pkgs/development/compilers/llvm/6/lldb.nix +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , cmake , zlib , ncurses @@ -20,6 +21,15 @@ stdenv.mkDerivation { src = fetch "lldb" "05178zkyh84x32n91md6wm22lkzzrrfwa5cpmgzn0yrg3y2771bb"; + patches = [ + # Fix PythonString::GetString for >=python-3.7 + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5457b426f5e15a29c0acc8af1a476132f8be2a36.patch"; + sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps"; + stripLen = 1; + }) + ]; + postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ diff --git a/pkgs/development/compilers/pforth/default.nix b/pkgs/development/compilers/pforth/default.nix index c13d28c6a3bbf..ce228c2f1cb53 100644 --- a/pkgs/development/compilers/pforth/default.nix +++ b/pkgs/development/compilers/pforth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation { version = "28"; @@ -10,6 +10,14 @@ stdenv.mkDerivation { sha256 = "0k3pmcgybsnwrxy75piyb2420r8d4ij190606js32j99062glr3x"; }; + patches = [ + (fetchpatch { + name = "gnumake-4.3-fix.patch"; + url = "https://github.com/philburk/pforth/commit/457cb99f57292bc855e53abcdcb7b12d6681e847.patch"; + sha256 = "0x1bwx3pqb09ddjhmdli47lnk1ys4ny42819g17kfn8nkjs5hbx7"; + }) + ]; + makeFlags = [ "SRCDIR=." ]; makefile = "build/unix/Makefile"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 18ec7ea302122..8d9feffc5ed42 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -208,11 +208,11 @@ self: super: { # Generating the completions should be activated again, once we default to # ghc 8.10. hnix = dontCheck (super.hnix.override { - # The neat-interpolation package from stack is to old for hnix. - # https://github.com/haskell-nix/hnix/issues/676 - # Once neat-interpolation >= 0.4 is in our stack release, - # (which should happen soon), we can remove this override - neat-interpolation = self.neat-interpolation_0_5_1_2; + # 2020-09-18: Those packages are all needed by hnix at versions newer than on stackage + neat-interpolation = self.neat-interpolation_0_5_1_2; # at least 0.5.1 + data-fix = self.data-fix_0_3_0; # at least 0.3 + prettyprinter = self.prettyprinter_1_7_0; # at least 1.7 + }); # Fails for non-obvious reasons while attempting to use doctest. @@ -1209,14 +1209,9 @@ self: super: { # this will probably need to get updated with every ghcide update, # we need an override because ghcide is tracking haskell-lsp closely. - ghcide = dontCheck (appendPatch (super.ghcide.override { + ghcide = dontCheck (super.ghcide.overrideScope (self: super: { hie-bios = dontCheck super.hie-bios_0_7_1; lsp-test = dontCheck self.lsp-test_0_11_0_5; - }) (pkgs.fetchpatch { - # This patch loosens the hie-bios upper bound. - # It is already merged into upstream and won‘t be needed for ghcide 0.4.0 - url = "https://github.com/haskell/ghcide/commit/3e1b3620948870a4da8808ca0c0897fbd3ecad16.patch"; - sha256 = "1jwn7jgi740x6wwv1k0mz9d4z0b9p3mzs54pdg4nfq0h2v7zxchz"; })); # hasn‘t bumped upper bounds @@ -1466,7 +1461,6 @@ self: super: { jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2; pandoc = doDistribute self.pandoc_2_10_1; pandoc-citeproc = doDistribute self.pandoc-citeproc_0_17_0_2; - pandoc-plot = doDistribute self.pandoc-plot_0_9_2_0; pandoc-types = doDistribute self.pandoc-types_1_21; rfc5051 = doDistribute self.rfc5051_0_2; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index bcbf09a4070df..541356d9b327f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -72,7 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 16.13 + # LTS Haskell 16.15 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -243,7 +243,7 @@ default-package-overrides: - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 - asn1-types ==0.3.4 - - assert-failure ==0.1.2.4 + - assert-failure ==0.1.2.5 - assoc ==1.0.2 - astro ==0.4.2.1 - async ==2.2.2 @@ -261,12 +261,12 @@ default-package-overrides: - attoparsec-iso8601 ==1.0.1.0 - attoparsec-path ==0.0.0.1 - audacity ==0.0.2 - - aur ==7.0.3 - - aura ==3.1.8 + - aur ==7.0.4 + - aura ==3.1.9 - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 - - autoexporter ==1.1.18 + - autoexporter ==1.1.19 - auto-update ==0.1.6 - avers ==0.0.17.1 - avro ==0.5.2.0 @@ -402,7 +402,7 @@ default-package-overrides: - casing ==0.1.4.1 - cassava ==0.5.2.0 - cassava-conduit ==0.5.1 - - cassava-megaparsec ==2.0.1 + - cassava-megaparsec ==2.0.2 - cast ==0.1.0.2 - category ==0.2.5.0 - cayley-client ==0.4.13 @@ -454,7 +454,7 @@ default-package-overrides: - clumpiness ==0.17.0.2 - ClustalParser ==1.3.0 - cmark ==0.6 - - cmark-gfm ==0.2.1 + - cmark-gfm ==0.2.2 - cmark-lucid ==0.1.0.0 - cmdargs ==0.10.20 - codec-beam ==0.2.0 @@ -657,7 +657,7 @@ default-package-overrides: - distributed-closure ==0.4.2.0 - distribution-opensuse ==1.1.1 - distributive ==0.6.2 - - dl-fedora ==0.7.4 + - dl-fedora ==0.7.5 - dlist ==0.8.0.8 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 @@ -671,7 +671,7 @@ default-package-overrides: - doldol ==0.4.1.2 - do-list ==1.0.1 - do-notation ==0.1.0.2 - - dotenv ==0.8.0.6 + - dotenv ==0.8.0.7 - dotgen ==0.4.3 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 @@ -733,7 +733,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.8 - - esqueleto ==3.3.3.3 + - esqueleto ==3.3.4.0 - essence-of-live-coding ==0.1.0.3 - essence-of-live-coding-gloss ==0.1.0.3 - essence-of-live-coding-pulse ==0.1.0.3 @@ -760,7 +760,7 @@ default-package-overrides: - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 - - extra ==1.7.7 + - extra ==1.7.8 - extractable-singleton ==0.0.1 - extrapolate ==0.4.2 - fail ==4.9.0.0 @@ -902,8 +902,8 @@ default-package-overrides: - ghcid ==0.8.7 - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - - ghc-lib ==8.10.2.20200808 - - ghc-lib-parser ==8.10.2.20200808 + - ghc-lib ==8.10.2.20200916 + - ghc-lib-parser ==8.10.2.20200916 - ghc-lib-parser-ex ==8.10.0.16 - ghc-parser ==0.2.2.0 - ghc-paths ==0.1.0.12 @@ -988,7 +988,7 @@ default-package-overrides: - hashable-time ==0.2.0.2 - hashids ==1.0.2.4 - hashmap ==1.3.3 - - hashtables ==1.2.3.4 + - hashtables ==1.2.4.1 - haskeline ==0.7.5.0 - haskell-gi ==0.23.1 - haskell-gi-base ==0.23.0 @@ -1130,7 +1130,7 @@ default-package-overrides: - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - http2 ==2.0.5 - - HTTP ==4000.3.14 + - HTTP ==4000.3.15 - http-api-data ==0.4.1.1 - http-client ==0.6.4.1 - http-client-openssl ==0.3.1.0 @@ -1205,7 +1205,7 @@ default-package-overrides: - indexed-list-literals ==0.2.1.3 - indexed-profunctors ==0.1 - infer-license ==0.2.0 - - inflections ==0.4.0.5 + - inflections ==0.4.0.6 - influxdb ==1.7.1.6 - ini ==0.4.1 - inj ==1.0 @@ -1232,11 +1232,11 @@ default-package-overrides: - invertible ==0.2.0.7 - invertible-grammar ==0.1.3 - io-machine ==0.2.0.0 - - io-manager ==0.1.0.2 + - io-manager ==0.1.0.3 - io-memoize ==1.1.1.0 - io-region ==0.1.1 - io-storage ==0.3 - - io-streams ==1.5.1.0 + - io-streams ==1.5.2.0 - io-streams-haproxy ==1.0.1.0 - ip6addr ==1.0.1 - iproute ==1.7.9 @@ -1597,7 +1597,7 @@ default-package-overrides: - OpenGLRaw ==3.3.4.0 - openpgp-asciiarmor ==0.1.2 - opensource ==0.1.1.0 - - openssl-streams ==1.2.2.0 + - openssl-streams ==1.2.3.0 - opentelemetry ==0.4.2 - opentelemetry-extra ==0.4.2 - opentelemetry-lightstep ==0.4.2 @@ -1782,7 +1782,7 @@ default-package-overrides: - pushbullet-types ==0.4.1.0 - pusher-http-haskell ==1.5.1.14 - pvar ==0.2.0.0 - - PyF ==0.9.0.1 + - PyF ==0.9.0.2 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - qrcode-core ==0.9.4 @@ -1793,7 +1793,7 @@ default-package-overrides: - quickcheck-arbitrary-adt ==0.3.1.0 - quickcheck-assertions ==0.3.0 - quickcheck-classes ==0.6.4.0 - - quickcheck-classes-base ==0.6.0.0 + - quickcheck-classes-base ==0.6.1.0 - quickcheck-instances ==0.3.23 - quickcheck-io ==0.2.0 - quickcheck-simple ==0.1.1.1 @@ -1886,7 +1886,7 @@ default-package-overrides: - rhine ==0.6.0 - rhine-gloss ==0.6.0.1 - rigel-viz ==0.2.0.0 - - rio ==0.1.18.0 + - rio ==0.1.19.0 - rio-orphans ==0.1.1.0 - rio-prettyprint ==0.1.1.0 - roc-id ==0.1.0.0 @@ -2039,7 +2039,7 @@ default-package-overrides: - smallcheck ==1.1.7 - smash ==0.1.1.0 - smash-aeson ==0.1.0.0 - - smash-lens ==0.1.0.0 + - smash-lens ==0.1.0.1 - smash-microlens ==0.1.0.0 - smoothie ==0.4.2.11 - snap-blaze ==0.2.1.5 @@ -2413,7 +2413,7 @@ default-package-overrides: - wai-cors ==0.2.7 - wai-enforce-https ==0.0.2.1 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.29.2 + - wai-extra ==3.0.31 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.3.6 - wai-middleware-caching ==0.1.0.2 @@ -2512,7 +2512,7 @@ default-package-overrides: - yesod-gitrev ==0.2.1 - yesod-newsfeed ==1.7.0.0 - yesod-persistent ==1.6.0.4 - - yesod-recaptcha2 ==1.0.0 + - yesod-recaptcha2 ==1.0.1 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.1.0 - yesod-test ==1.6.10 @@ -3441,6 +3441,7 @@ broken-packages: - bitcoin-api - bitcoin-api-extra - bitcoin-block + - bitcoin-compact-filters - bitcoin-hs - bitcoin-rpc - bitcoin-script @@ -5543,6 +5544,7 @@ broken-packages: - graphicstools - graphmod-plugin - graphql + - graphql-utils - graphql-w-persistent - graphted - graphtype @@ -7515,6 +7517,7 @@ broken-packages: - LslPlus - lsystem - ltext + - lti13 - ltk - LTS - lua-bc @@ -11227,6 +11230,7 @@ broken-packages: - yesod-auth-ldap - yesod-auth-ldap-mediocre - yesod-auth-ldap-native + - yesod-auth-lti13 - yesod-auth-nopassword - yesod-auth-oauth2 - yesod-auth-pam diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index cff7cc2cd80d7..a1938de0ab373 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -571,9 +571,20 @@ self: super: builtins.intersectAttrs super { })); # Expects z3 to be on path so we replace it with a hard + # + # The tests expect additional solvers on the path, replace the + # available ones also with hard coded paths, and remove the missing + # ones from the test. sbv = overrideCabal super.sbv (drv: { postPatch = '' - sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs''; + sed -i -e 's|"abc"|"${pkgs.abc-verifier}/bin/abc"|' Data/SBV/Provers/ABC.hs + sed -i -e 's|"boolector"|"${pkgs.boolector}/bin/boolector"|' Data/SBV/Provers/Boolector.hs + sed -i -e 's|"cvc4"|"${pkgs.cvc4}/bin/cvc4"|' Data/SBV/Provers/CVC4.hs + sed -i -e 's|"yices-smt2"|"${pkgs.yices}/bin/yices-smt2"|' Data/SBV/Provers/Yices.hs + sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs + + sed -i -e 's|\[abc, boolector, cvc4, mathSAT, yices, z3, dReal\]|[abc, boolector, cvc4, yices, z3]|' SBVTestSuite/SBVConnectionTest.hs + ''; }); # The test-suite requires a running PostgreSQL server. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a6f5ba494c88d..4bdd2471708d0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9438,10 +9438,8 @@ self: { }: mkDerivation { pname = "HTTP"; - version = "4000.3.14"; - sha256 = "0yv8mbjicpl7l2017c4dhm49117lblgwpy1llv368wci1vrxf0m6"; - revision = "1"; - editedCabalFile = "1inz9grpl9605bbymy6n5y4as54mlykbsiw8wpm5gl6qvxgrf69w"; + version = "4000.3.15"; + sha256 = "150m5v125s4jrxzl85jhnh69kp4mjyzhkqp0c1k087008f73csqd"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -16298,29 +16296,6 @@ self: { "PyF" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , filepath, hashable, haskell-src-exts, haskell-src-meta, hspec - , HUnit, megaparsec, mtl, process, python3, template-haskell - , temporary, text - }: - mkDerivation { - pname = "PyF"; - version = "0.9.0.1"; - sha256 = "00pmpm2g7161bksc1l5clkghi0sbzh8y0f6xd52gwx9h6zxacns3"; - libraryHaskellDepends = [ - base containers haskell-src-exts haskell-src-meta megaparsec mtl - template-haskell text - ]; - testHaskellDepends = [ - base bytestring deepseq directory filepath hashable hspec HUnit - process template-haskell temporary text - ]; - testToolDepends = [ python3 ]; - description = "Quasiquotations for a python like interpolated string formater"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) python3;}; - - "PyF_0_9_0_2" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , filepath, hashable, haskell-src-exts, haskell-src-meta, hspec , HUnit, megaparsec, mtl, process, template-haskell, temporary , text }: @@ -16338,7 +16313,6 @@ self: { ]; description = "Quasiquotations for a python like interpolated string formater"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QIO" = callPackage @@ -17325,18 +17299,19 @@ self: { }) {}; "RtMidi" = callPackage - ({ mkDerivation, alsaLib, base, tasty, tasty-hunit, unliftio-core + ({ mkDerivation, alsaLib, base, deepseq, pretty-simple, tasty + , tasty-hunit, unliftio-core, vector }: mkDerivation { pname = "RtMidi"; - version = "0.2.0.0"; - sha256 = "110fdfa47lmgvk1xjgl71hicbnv6j3ihw2r4i3nig28ciliyc2v2"; + version = "0.4.0.0"; + sha256 = "075j6d7vmihyz33b5ikv2l0c0alnhjzy1wpnzdrca6l201vab2mw"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base unliftio-core ]; + libraryHaskellDepends = [ base deepseq unliftio-core vector ]; librarySystemDepends = [ alsaLib ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base tasty tasty-hunit ]; + executableHaskellDepends = [ base pretty-simple vector ]; + testHaskellDepends = [ base tasty tasty-hunit vector ]; description = "Haskell wrapper for RtMidi, the lightweight, cross-platform MIDI I/O library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -21846,6 +21821,30 @@ self: { broken = true; }) {inherit (pkgs) readline;}; + "Z-Data" = callPackage + ({ mkDerivation, base, 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.1.0"; + sha256 = "0z7cri6mkmj22ffwg3mz8yyjr81z4ww7kkmi7m9ilmbbpssma5fw"; + 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 + ]; + description = "array, vector and text"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ZEBEDDE" = callPackage ({ mkDerivation, base, vect }: mkDerivation { @@ -24580,8 +24579,8 @@ self: { }: mkDerivation { pname = "aeson-injector"; - version = "1.1.3.0"; - sha256 = "0188g4z204dw8gyza5hn3xljwmvfk9jq1wq4gnh43894nbrcm4ji"; + version = "1.1.4.0"; + sha256 = "1q8wv9xdw8nw504dxplb3ibskfjqbawmv2694sjwg5cvi8d7fvkn"; libraryHaskellDepends = [ aeson base bifunctors deepseq hashable lens servant-docs swagger2 text unordered-containers @@ -33532,25 +33531,12 @@ self: { ({ mkDerivation, base, pretty-show, text }: mkDerivation { pname = "assert-failure"; - version = "0.1.2.4"; - sha256 = "0q4kaaxvz89qrw7j9kgh57nzyn6a8rh2w1hjb1h7ymdnznhr3cj4"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ base pretty-show text ]; - description = "Syntactic sugar improving 'assert' and 'error'"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "assert-failure_0_1_2_5" = callPackage - ({ mkDerivation, base, pretty-show, text }: - mkDerivation { - pname = "assert-failure"; version = "0.1.2.5"; sha256 = "0k8a7g82dsj50djpy2kvhnfljb3y9w9dx9mpymvn6hxd6rir4bpm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base pretty-show text ]; description = "Syntactic sugar improving 'assert' and 'error'"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "assertions" = callPackage @@ -34459,8 +34445,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.5.0.1"; - sha256 = "09vv8cmag4189sv0nv213vhxp4pak5swk3gi4pnl777lmm0qgxxh"; + version = "3.5.0.2"; + sha256 = "1whx2yyjxc3b4s7nrwrxvyz9bwy7n15gmr9m6lcs3zxr7dvwvlmk"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -35029,8 +35015,8 @@ self: { }: mkDerivation { pname = "aur"; - version = "7.0.3"; - sha256 = "0q54p9lb65k8n41gya09k8232y1piyfmks71c2z38kybh783mgg2"; + version = "7.0.4"; + sha256 = "0zq1p255qpi1alnhm7k4aj9w4v8y4ybdywbw5w9jbx47imfqqp9y"; libraryHaskellDepends = [ aeson base bytestring http-client http-types text ]; @@ -35071,10 +35057,8 @@ self: { }: mkDerivation { pname = "aura"; - version = "3.1.8"; - sha256 = "19zm9bwpixqdg4a5mcrv2c8fyhygjzawjrwv1jwwhcczqsrjwvrw"; - revision = "1"; - editedCabalFile = "0yi5hhsjv77v9gqsj6ix6nb042nywkwdwkjljpzbvl7pvsv4asr3"; + version = "3.1.9"; + sha256 = "1q248qh2wpm0gq07pihw3gshd3ixjdl1l3bf1cpxabn0gjss4hma"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35248,8 +35232,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; - version = "1.1.18"; - sha256 = "0pzszi5q7h1qxqh2fpds8d43miq0cf4mfzcwggi8409s72pyf9xl"; + version = "1.1.19"; + sha256 = "0hgxfd5pykl6y1v3asnh46abfmi5fsdp0hs1kf6a2acqsnx9vad7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal directory filepath ]; @@ -37633,6 +37617,8 @@ self: { pname = "base16"; version = "0.3.0.1"; sha256 = "10id9h9mas4kb4kfiz7hhp2hhwnb9mh92pr327c53jqxi4hazgnd"; + revision = "2"; + editedCabalFile = "1ryc4228j4v9mcfjkgallfmww7g19y4awkqyq4j4734rgvkvgslw"; libraryHaskellDepends = [ base bytestring deepseq primitive text text-short ]; @@ -37655,12 +37641,36 @@ self: { pname = "base16-bytestring"; version = "0.1.1.7"; sha256 = "1fk9zvkx005sy4adbyil86svnqhgrvmczmf16ajhzj2wkmkqjmjj"; + revision = "3"; + editedCabalFile = "1lrxqhbjsml0q1ahpcx7p0xjy6bj1m6qzjwmv841r5r8jrm2a880"; libraryHaskellDepends = [ base bytestring ghc-prim ]; testHaskellDepends = [ base bytestring ]; description = "Fast base16 (hex) encoding and decoding for ByteStrings"; license = stdenv.lib.licenses.bsd3; }) {}; + "base16-bytestring_1_0_0_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "base16-bytestring"; + version = "1.0.0.0"; + sha256 = "12bnl2fs0h4hcjpr69xqqngjh0117dlvkv56lxski6g6fnbwps2r"; + revision = "1"; + editedCabalFile = "0k47j9csaqizvbk3v7zm05l3z23v359h3w079chzbf44z99hkphc"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; + description = "RFC 4648-compliant Base16 encodings for ByteStrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base16-lens" = callPackage ({ mkDerivation, base, base16, bytestring, Cabal, cabal-doctest , doctest, lens, text @@ -37724,6 +37734,8 @@ self: { pname = "base32"; version = "0.2.0.0"; sha256 = "0xvilxcdcvz07f3qpad35whjd35c9ykicip2cdsd54ysxg71mwzm"; + revision = "1"; + editedCabalFile = "0vsc0fq4rihhx4hicfgy1xpfm1bbq4rnwgfs9qzgmwhslffqy2x5"; libraryHaskellDepends = [ base bytestring deepseq ghc-byteorder text text-short ]; @@ -37893,6 +37905,8 @@ self: { pname = "base64"; version = "0.4.2.2"; sha256 = "05ins0i1561d4gfz6h7fxx8pj8i1qkskz8dgh8pfxa1llzmr856i"; + revision = "1"; + editedCabalFile = "1rlvmg18f2d2rdyzvvzk0is4073j5arx9qirgvshjx67kic2lzqm"; libraryHaskellDepends = [ base bytestring deepseq ghc-byteorder text text-short ]; @@ -41983,6 +41997,30 @@ self: { broken = true; }) {}; + "bitcoin-compact-filters" = callPackage + ({ mkDerivation, aeson, base, bitstream, bytestring, cereal + , haskoin-core, memory, tasty, tasty-hunit, tasty-quickcheck, text + , transformers + }: + mkDerivation { + pname = "bitcoin-compact-filters"; + version = "0.1.0.0"; + sha256 = "0ikirjf0n0np0l6mjfyfxvp367imbmb3g092m4mq457ja8yp7r8m"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bitstream bytestring cereal haskoin-core memory text + transformers + ]; + testHaskellDepends = [ + aeson base bytestring cereal haskoin-core tasty tasty-hunit + tasty-quickcheck text + ]; + description = "BIP 158 compact block filters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "bitcoin-hash" = callPackage ({ mkDerivation, base, bytestring, cryptonite, memory, tasty , tasty-hunit, time @@ -46835,6 +46873,8 @@ self: { pname = "bytestring"; version = "0.10.12.0"; sha256 = "1s1kgnqb8ybz223sf2838mmxnlhwsd3lnakng6ap38m058bzzj7d"; + revision = "1"; + editedCabalFile = "10d0n2k8zhlw0bbrm2na9zchlggm8ix2wi2lav6vkbd98sg96mip"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; description = "Fast, compact, strict and lazy byte strings with a list interface"; license = stdenv.lib.licenses.bsd3; @@ -49500,8 +49540,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.20.0"; - sha256 = "0b11nkh4wynb8rdhn8qym5422l0nc49shkkp2mfbwh7yhmzaqwrh"; + version = "0.1.20.1"; + sha256 = "0nh9x2w8xrmbrkadawq0ab6pvp4v14pr49x18sq9qhi0m922b0p0"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra containers data-default-class data-flags deepseq deque df1 di-core di-polysemy @@ -51069,24 +51109,6 @@ self: { }: mkDerivation { pname = "cassava-megaparsec"; - version = "2.0.1"; - sha256 = "0q4skw98nzy6icmgpwqvgw0c5pqcgi25rf7nmwh2pksvv94pi3p3"; - libraryHaskellDepends = [ - base bytestring cassava megaparsec unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring cassava hspec hspec-megaparsec vector - ]; - description = "Megaparsec parser of CSV files that plays nicely with Cassava"; - license = stdenv.lib.licenses.mit; - }) {}; - - "cassava-megaparsec_2_0_2" = callPackage - ({ mkDerivation, base, bytestring, cassava, hspec, hspec-megaparsec - , megaparsec, unordered-containers, vector - }: - mkDerivation { - pname = "cassava-megaparsec"; version = "2.0.2"; sha256 = "03x1462agrfdagklp8c89b8p4z2hd8nbf6d3895sz770zjkawda7"; libraryHaskellDepends = [ @@ -51097,7 +51119,6 @@ self: { ]; description = "Megaparsec parser of CSV files that plays nicely with Cassava"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassava-records" = callPackage @@ -54895,8 +54916,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.26.0"; - sha256 = "0yjw0kk241qbh2z6248savy3a99asd3smva1qbplga31232a8025"; + version = "0.26.1"; + sha256 = "1n37gllcgq05wgvq4f10vwz7lll6q8an1gak69m50n6fwx8zpb5i"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring @@ -56068,8 +56089,8 @@ self: { }: mkDerivation { pname = "cmark-gfm"; - version = "0.2.1"; - sha256 = "1qbhcirg7a0r68l3ifq8q9clnkai5hyhk62jb232bjplrl6y4c23"; + version = "0.2.2"; + sha256 = "1skzdg1icmhn0zrkhbnba4200ymah8sd5msk4qfgawrk77zilw7f"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base HUnit text ]; benchmarkHaskellDepends = [ @@ -58961,8 +58982,8 @@ self: { ({ mkDerivation, base, composite-base }: mkDerivation { pname = "composite-tuple"; - version = "0.1.0.0"; - sha256 = "1c3xljlwisx3b9p5nz8jny7svsjjzazpvywwksxqccfv1vipi50z"; + version = "0.1.1.0"; + sha256 = "0ykxf17zlyjrs8nhj02r0k3l20x7ih1k1z5byxdvw7gxjwsqwq2d"; libraryHaskellDepends = [ base composite-base ]; description = "Tuple functions for composite records"; license = stdenv.lib.licenses.mit; @@ -72531,6 +72552,8 @@ self: { pname = "dhall"; version = "1.35.0"; sha256 = "19h0afgxqq9da1apx4xx9p4p0f2r6miivc4l1dkhbbvfk2r5wkw3"; + revision = "1"; + editedCabalFile = "16hlc738l0w58g5fj6kyr7il24n23a6jbwd6m0xc1sncv74pxh8w"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -72595,6 +72618,8 @@ self: { pname = "dhall-bash"; version = "1.0.33"; sha256 = "0b920cscim2mqcav0yy4s00gcgjqfybvbmfvnnbvarxswknw8z1v"; + revision = "1"; + editedCabalFile = "1r01himc5n19q9675i6i27yrfrx9l362ycsnvk48mcbrbmv1z5lf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72840,6 +72865,8 @@ self: { pname = "dhall-nix"; version = "1.1.17"; sha256 = "1c696f0if218pbmir4rmkb6shcgk9acw5g1iwcb2mslshmncbyfd"; + revision = "1"; + editedCabalFile = "0vdni3cmx3p6a0p587avja4zg6278fmdfv6jh5h4wfx0b7z1sphg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74611,8 +74638,8 @@ self: { }: mkDerivation { pname = "diohsc"; - version = "0.1.1"; - sha256 = "129ray1dp18f24zfxm8qj5rmafcpz0gyfp4nhf5y0yjh41jffixf"; + version = "0.1.2"; + sha256 = "0ksawn7wspw1f3yaaqyz4sgbl0p9fnidn1jjfwmjs9zrna1cb084"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -76261,8 +76288,8 @@ self: { }: mkDerivation { pname = "dl-fedora"; - version = "0.7.4"; - sha256 = "092fmla7a0xbnfac6izcj08wsyxbd04n23cjy33c132lqhs5k6w5"; + version = "0.7.5"; + sha256 = "1x4gdnb2k1ywvaniif7j2lsbavadaghvcpbdnms3x13s4cg18lyh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -77510,34 +77537,6 @@ self: { }: mkDerivation { pname = "dotenv"; - version = "0.8.0.6"; - sha256 = "0ndgsjjcpmhxaxjn4mmw4cyd6i2y67zpx9ap099k5jw9ad0lbwb0"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base base-compat containers directory exceptions megaparsec process - text transformers yaml - ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - transformers yaml - ]; - testHaskellDepends = [ - base base-compat containers directory exceptions hspec - hspec-megaparsec megaparsec process text transformers yaml - ]; - description = "Loads environment variables from dotenv files"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dotenv_0_8_0_7" = callPackage - ({ mkDerivation, base, base-compat, containers, directory - , exceptions, hspec, hspec-megaparsec, megaparsec - , optparse-applicative, process, text, transformers, yaml - }: - mkDerivation { - pname = "dotenv"; version = "0.8.0.7"; sha256 = "11x7aiflf45rdbbzk33pg8v2x5a4bnbhi6845bi3wpgq7y27210v"; isLibrary = true; @@ -77557,7 +77556,6 @@ self: { ]; description = "Loads environment variables from dotenv files"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dotfs" = callPackage @@ -83792,8 +83790,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.3.3.3"; - sha256 = "14h6x4bj39ffz7arn9ddyjabb5s2a8ynphjvha606lz4mcv3mxkv"; + version = "3.3.4.0"; + sha256 = "1w46sfh4rrj7lvsdyzwphcv8n00v6kr3padkk8v5lr0r40w5n60r"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -85522,6 +85520,25 @@ self: { broken = true; }) {inherit (pkgs) exif;}; + "exiftool" = callPackage + ({ mkDerivation, aeson, base, base64, bytestring, hashable, process + , scientific, string-conversions, temporary, text + , unordered-containers, vector + }: + mkDerivation { + pname = "exiftool"; + version = "0.1.0.0"; + sha256 = "015f0ai0x6iv49k4ljz8058509h8z8kkgnp7p9l4s8z54sgqfw8y"; + revision = "1"; + editedCabalFile = "06w0g76jddjykbvym2zgcwjsa33alm1rwshhzaw0pqm573mqbp26"; + libraryHaskellDepends = [ + aeson base base64 bytestring hashable process scientific + string-conversions temporary text unordered-containers vector + ]; + description = "Haskell bindings to ExifTool"; + license = stdenv.lib.licenses.mit; + }) {}; + "exigo-schema" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, directory , esqueleto, exceptions, hint, hspec, hspec-core, interpolate @@ -86486,8 +86503,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.7.7"; - sha256 = "1ark7b6xknc44v8jg5aymxffj5d0qr81frjpg2ffqrkwnhva0w5s"; + version = "1.7.8"; + sha256 = "1sgd08h9p7ywmv08yd1h6z1bpf6pqpj1qn4v7vv7w4la86jmh2yg"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -95198,8 +95215,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "funspection"; - version = "1.0.0.0"; - sha256 = "0jbzvn06d5kfyiav3fjd6k8sk8dy00pwk2g711nrbmlrljbw7f39"; + version = "1.0.0.1"; + sha256 = "0jf8yhk45n06avl9avgmawvazsz585i7jppvcds6pjd8pqdb2qk4"; libraryHaskellDepends = [ base ]; description = "Type-level function utilities"; license = stdenv.lib.licenses.bsd3; @@ -99127,8 +99144,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "8.10.2.20200808"; - sha256 = "0vh941bk7fy44rn5hwqa25xbfyhm28wcy4nwpvm3291lp0cxndgh"; + version = "8.10.2.20200916"; + sha256 = "0yarxqbl7njqhfycrdz4lr6m04wqhrlsgb9vcq6gbmlizswwxr6g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -99146,8 +99163,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "8.10.2.20200808"; - sha256 = "0nfxsvpsiyxbjc3hvdax70z07k08bc255lz9jhqgq57lnw46dyfl"; + version = "8.10.2.20200916"; + sha256 = "0azfy14w268by4ydaarjdw7awbd44pgqg03zykzfg7iabyzr2dfk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -100056,18 +100073,19 @@ self: { , directory, extra, filepath, fuzzy, ghc, ghc-boot, ghc-boot-th , ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev , haddock-library, hashable, haskell-lsp, haskell-lsp-types - , hie-bios, hslogger, lens, lsp-test, mtl, network-uri - , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , process, QuickCheck, quickcheck-instances, 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 + , hie-bios, hslogger, implicit-hie-cradle, lens, lsp-test, mtl + , network-uri, optparse-applicative, 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 }: mkDerivation { pname = "ghcide"; - version = "0.3.0"; - sha256 = "001g3240qd9q9j00cmvz9d0b73mbf8mv5204cyf5jh04xcd09908"; + version = "0.4.0"; + sha256 = "0h714pfdjkb4rbq9kz3ilj52nxdvr3c0w5nms5znxjlaysgaqp5l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100075,24 +100093,25 @@ self: { containers cryptohash-sha1 data-default deepseq directory extra filepath fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-paths haddock-library hashable haskell-lsp haskell-lsp-types hie-bios - hslogger 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 + 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 ]; executableHaskellDepends = [ aeson base bytestring containers data-default directory extra filepath gitrev hashable haskell-lsp haskell-lsp-types hie-bios - lsp-test optparse-applicative process safe-exceptions text + lens lsp-test optparse-applicative process safe-exceptions text unordered-containers ]; testHaskellDepends = [ aeson base binary bytestring containers directory extra filepath ghc ghc-typelits-knownnat haddock-library haskell-lsp haskell-lsp-types lens lsp-test network-uri optparse-applicative - process QuickCheck quickcheck-instances rope-utf16-splay safe - safe-exceptions shake tasty tasty-expected-failure tasty-hunit - tasty-quickcheck tasty-rerun text + process QuickCheck quickcheck-instances record-dot-preprocessor + record-hasfield rope-utf16-splay safe safe-exceptions shake tasty + tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun + text ]; benchmarkHaskellDepends = [ aeson base Chart Chart-diagrams diagrams diagrams-svg directory @@ -100576,6 +100595,23 @@ self: { broken = true; }) {}; + "gi-cairo-connector_0_1_0" = callPackage + ({ mkDerivation, base, gi-cairo, gi-cairo-render, haskell-gi-base + , mtl + }: + mkDerivation { + pname = "gi-cairo-connector"; + version = "0.1.0"; + sha256 = "115iy6sd77aabzghdmfpn5w2zqqalrxgbs5i93z49y3vz4wsjiwf"; + libraryHaskellDepends = [ + base gi-cairo gi-cairo-render haskell-gi-base mtl + ]; + description = "GI friendly Binding to the Cairo library"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "gi-cairo-render" = callPackage ({ mkDerivation, array, base, bytestring, c2hs, cairo , haskell-gi-base, mtl, text, utf8-string @@ -100597,6 +100633,25 @@ self: { broken = true; }) {inherit (pkgs) cairo;}; + "gi-cairo-render_0_1_0" = callPackage + ({ mkDerivation, array, base, bytestring, c2hs, cairo + , haskell-gi-base, mtl, text, utf8-string + }: + mkDerivation { + pname = "gi-cairo-render"; + version = "0.1.0"; + sha256 = "1b2qxfahs4w288i6w5m0rs74amnm3zp0mj2vsccf34q437yni2gx"; + libraryHaskellDepends = [ + array base bytestring haskell-gi-base mtl text utf8-string + ]; + libraryPkgconfigDepends = [ cairo ]; + libraryToolDepends = [ c2hs ]; + description = "GI friendly Binding to the Cairo library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) cairo;}; + "gi-dbusmenu" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading @@ -103020,15 +103075,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "gitlab-haskell_0_2_2" = callPackage + "gitlab-haskell_0_2_3" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, http-conduit , http-types, tasty, tasty-hunit, text, time, transformers , unliftio, unliftio-core }: mkDerivation { pname = "gitlab-haskell"; - version = "0.2.2"; - sha256 = "10c6fv0hd8fnll56l7p4qbhyb0b4imiav910762kywbfrz1z6w18"; + version = "0.2.3"; + sha256 = "0nsb7rkqflss6bhdvbjbgg2akwavz777icfkpfy97ix9ahq0i1r8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring connection http-conduit http-types text time @@ -108529,14 +108584,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "graphql-utils" = callPackage + ({ mkDerivation, aeson, aeson-helper, base, graphql, text + , unordered-containers, vector + }: + mkDerivation { + pname = "graphql-utils"; + version = "0.1.0.0"; + sha256 = "1m0wan1isb1b574q933mm8xd7gnw2qrf2fd7z0sr7bnqlnl6nkjk"; + libraryHaskellDepends = [ + aeson aeson-helper base graphql text unordered-containers vector + ]; + description = "GraphQL Utils"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "graphql-w-persistent" = callPackage ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.9.0.0"; - sha256 = "1kwrpcrvf6j23lq40j6kyrp6wvya2rb4l6zgn47bwcignac1ag3g"; + version = "0.9.1.0"; + sha256 = "0sm0j1d2h6b2d3ksbbdyvzyvwl306mb64yikwkdwp2izfy387lwg"; libraryHaskellDepends = [ base containers json text ]; - description = "GraphQL interface middleware for (SQL) databases"; + description = "GraphQL interface middleware for SQL databases"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -111691,8 +111763,8 @@ self: { pname = "hackage-security"; version = "0.6.0.1"; sha256 = "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli"; - revision = "3"; - editedCabalFile = "03cc99ynscxhmw1mxm2xn2ywvfnl1zfb3rdbbcc7fvm92nznzpyi"; + revision = "4"; + editedCabalFile = "06d4xqmpqarisxlm0sp87w2z9rl62p08z5ra5swkvfwn36i9zr15"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -115196,31 +115268,32 @@ self: { ({ mkDerivation, base, brick, containers, directory, filepath , megaparsec, microlens, microlens-platform, mwc-random , optparse-applicative, ordered-containers, process, random-fu - , strict, text, vector, vty, word-wrap + , split, strict, tasty, tasty-hunit, tasty-quickcheck, text, vector + , vty, word-wrap }: mkDerivation { pname = "hascard"; - version = "0.3.0.1"; - sha256 = "17f08qqwdzala1ldyarp841gpjl9iayi1440r77n8bkzcq3hpl54"; + version = "0.4.0.0"; + sha256 = "1rkcnpv22bfiyzmfdk82531yv6mh6g7imjch9qy8sxda2d73fdm7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers directory filepath megaparsec microlens microlens-platform mwc-random optparse-applicative - ordered-containers process random-fu strict text vector vty - word-wrap + ordered-containers process random-fu split strict tasty tasty-hunit + tasty-quickcheck text vector vty word-wrap ]; executableHaskellDepends = [ base brick containers directory filepath megaparsec microlens microlens-platform mwc-random optparse-applicative - ordered-containers process random-fu strict text vector vty - word-wrap + ordered-containers process random-fu split strict tasty tasty-hunit + tasty-quickcheck text vector vty word-wrap ]; testHaskellDepends = [ base brick containers directory filepath megaparsec microlens microlens-platform mwc-random optparse-applicative - ordered-containers process random-fu strict text vector vty - word-wrap + ordered-containers process random-fu split strict tasty tasty-hunit + tasty-quickcheck text vector vty word-wrap ]; description = "A TUI for reviewing notes using 'flashcards' written with markdown-like syntax"; license = stdenv.lib.licenses.bsd3; @@ -115654,19 +115727,6 @@ self: { }) {}; "hashtables" = callPackage - ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: - mkDerivation { - pname = "hashtables"; - version = "1.2.3.4"; - sha256 = "1rjmxnr30g4hygiywkpz5p9sanh0abs7ap4zc1kgd8zv04kycp0j"; - libraryHaskellDepends = [ - base ghc-prim hashable primitive vector - ]; - description = "Mutable hash tables in the ST monad"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hashtables_1_2_4_1" = callPackage ({ mkDerivation, base, ghc-prim, hashable, HUnit, mwc-random , primitive, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, vector @@ -115685,7 +115745,6 @@ self: { ]; description = "Mutable hash tables in the ST monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashtables-plus" = callPackage @@ -125296,8 +125355,8 @@ self: { pname = "hie-bios"; version = "0.7.1"; sha256 = "00gkr4dbbs70vnd6y90iirss88j8ax714l9jmwdfkmslwd4m2ml8"; - revision = "1"; - editedCabalFile = "1whhyczfr1d03gmsi7pw31321km53y0hjdhjyy2bxhk3z9ch6ji5"; + revision = "3"; + editedCabalFile = "104cp386qbk6k72s2ld1cl0fny3f53x98zy3w10mlhqyaipqrf17"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127467,8 +127526,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.1.6"; - sha256 = "1kbzj3qw3rr4yb2x50q79abckh6fvadbzqidbzkbydqqm0yhqhnx"; + version = "3.2"; + sha256 = "0g3ay30dwr2v22bybapryl0ykjyqs5ym1i1p7jfky7lp20ri9x1z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -127614,6 +127673,24 @@ self: { broken = true; }) {}; + "hls-plugin-api" = callPackage + ({ mkDerivation, aeson, base, containers, data-default, Diff, ghc + , ghc-boot-th, ghcide, haskell-lsp, hslogger, lens, process + , regex-tdfa, shake, text, unordered-containers + }: + mkDerivation { + pname = "hls-plugin-api"; + version = "0.4.0.0"; + sha256 = "1fr9j1nf0lkff3fb5vslfvkb42836ncfhhkswn8rq6mwlv0mv03k"; + libraryHaskellDepends = [ + aeson base containers data-default Diff ghc ghc-boot-th ghcide + haskell-lsp hslogger lens process regex-tdfa shake text + unordered-containers + ]; + description = "Haskell Language Server API for plugin communication"; + license = stdenv.lib.licenses.asl20; + }) {}; + "hlwm" = callPackage ({ mkDerivation, base, stm, transformers, unix, X11 }: mkDerivation { @@ -128350,28 +128427,27 @@ self: { ({ mkDerivation, aeson, array, base, base16-bytestring, binary , bytestring, comonad, containers, criterion, data-fix, deepseq , deriving-compat, Diff, directory, exceptions, filepath, free - , Glob, hashable, hashing, hedgehog, hnix-store-core, http-client - , http-client-tls, http-types, lens-family, lens-family-core - , lens-family-th, logict, megaparsec, monad-control, monadlist, mtl - , neat-interpolation, optparse-applicative, parser-combinators - , pretty-show, prettyprinter, process, ref-tf, regex-tdfa - , scientific, semialign, semialign-indexed, serialise, some, split - , syb, tasty, tasty-hedgehog, tasty-hunit, tasty-th - , template-haskell, text, these, time, transformers - , transformers-base, unix, unordered-containers, vector, xml + , gitrev, Glob, hashable, hashing, hedgehog, hnix-store-core + , http-client, http-client-tls, http-types, lens-family + , lens-family-core, lens-family-th, logict, megaparsec + , monad-control, monadlist, mtl, neat-interpolation + , optparse-applicative, parser-combinators, pretty-show + , prettyprinter, process, ref-tf, regex-tdfa, scientific, semialign + , semialign-indexed, serialise, some, split, syb, tasty + , tasty-hedgehog, tasty-hunit, tasty-th, template-haskell, text + , these, time, transformers, transformers-base, unix + , unordered-containers, vector, xml }: mkDerivation { pname = "hnix"; - version = "0.9.1"; - sha256 = "1vxb55ih0gpaazb8kvms2sw21l78hb36cbz5217vg94i3yvk8zls"; - revision = "2"; - editedCabalFile = "17fxwg4bxnpwhwfwmh42xrwq6ajbk5b707zl8f01z0cyskzabzxy"; + version = "0.10.1"; + sha256 = "19a5pa1ji4hjr3vjvbkjmhnysnd8jcpkzlj9f2qw67h5iagysccy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring comonad containers data-fix deepseq deriving-compat directory exceptions - filepath free hashable hashing hnix-store-core http-client + filepath free gitrev hashable hashing hnix-store-core http-client http-client-tls http-types lens-family lens-family-core lens-family-th logict megaparsec monad-control monadlist mtl neat-interpolation optparse-applicative parser-combinators @@ -130906,8 +130982,8 @@ self: { }: mkDerivation { pname = "hpqtypes"; - version = "1.9.0.1"; - sha256 = "1s5bd631nzc2kw22ngzf30pywgb7yc33m93dxcr2xa2wx0za3fv2"; + version = "1.9.1.0"; + sha256 = "13q20ak0zakwvlc05y187iq2vpvdjx9dlmvmgvv2gjd263sqcgm2"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ aeson async base bytestring containers exceptions lifted-base @@ -143202,8 +143278,8 @@ self: { }: mkDerivation { pname = "implicit-hie-cradle"; - version = "0.1.0.0"; - sha256 = "0yyzfpmv5x2ivzjsjwngklxv5nkad987ns8w3g7h92s5j1fb7x82"; + version = "0.2.0.0"; + sha256 = "1rzif3hzayqhm6spmynvw7ynkymsycaiycf6z9h18382vsd53qrk"; libraryHaskellDepends = [ base base16-bytestring bytestring containers directory extra filepath hie-bios hslogger implicit-hie process temporary text time @@ -143899,19 +143975,28 @@ self: { }) {}; "indigo" = callPackage - ({ mkDerivation, base, cleveland, constraints, containers, fmt - , hedgehog, hspec-expectations, HUnit, lorentz, morley - , morley-prelude, reflection, singletons, tasty, tasty-discover - , tasty-hedgehog, tasty-hunit-compat, vinyl, with-utf8 + ({ mkDerivation, base, 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 }: mkDerivation { pname = "indigo"; - version = "0.2.1"; - sha256 = "07zgqg6d4ijfvdg0q9lgfi545c903lc6mbcc9mzyfl4b3gpxqfpj"; + version = "0.2.2"; + sha256 = "1ggq5ryq90vmxd4ar93nsfzmmq7b1h3i4piv39220kkpgzz2x291"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base constraints containers lorentz morley morley-prelude reflection singletons vinyl with-utf8 ]; + executableHaskellDepends = [ + base directory megaparsec morley morley-prelude + optparse-applicative process shelly string-interpolate summoner + text with-utf8 + ]; testHaskellDepends = [ base cleveland containers fmt hedgehog hspec-expectations HUnit lorentz morley morley-prelude singletons tasty tasty-hedgehog @@ -144067,25 +144152,6 @@ self: { }: mkDerivation { pname = "inflections"; - version = "0.4.0.5"; - sha256 = "0fdq3iwa2vgb5k19ck6jxzh7f1xsf1kpwx4p3agpdpsrylrcanvb"; - libraryHaskellDepends = [ - base exceptions megaparsec text unordered-containers - ]; - testHaskellDepends = [ - base containers hspec hspec-megaparsec megaparsec QuickCheck text - ]; - description = "Inflections library for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "inflections_0_4_0_6" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec - , hspec-megaparsec, megaparsec, QuickCheck, text - , unordered-containers - }: - mkDerivation { - pname = "inflections"; version = "0.4.0.6"; sha256 = "1054v250p86gb1kvbrp60fzwds8v8nsqap1970j7hgk5hjwq1xj1"; libraryHaskellDepends = [ @@ -144096,7 +144162,6 @@ self: { ]; description = "Inflections library for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inflist" = callPackage @@ -145899,20 +145964,6 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "io-manager"; - version = "0.1.0.2"; - sha256 = "0f21h36z2ls0d6g31pcf4kcyfninaxws8w159zy33bwa19saf2mz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers ]; - executableHaskellDepends = [ base containers ]; - description = "Skeleton library around the IO monad"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "io-manager_0_1_0_3" = callPackage - ({ mkDerivation, base, containers }: - mkDerivation { - pname = "io-manager"; version = "0.1.0.3"; sha256 = "04584flxw3qwzdnas8nbxp6riw6jfvhgy0kkkzjkxg53y1d8ri3s"; isLibrary = true; @@ -145921,7 +145972,6 @@ self: { executableHaskellDepends = [ base containers ]; description = "Skeleton library around the IO monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "io-memoize" = callPackage @@ -145983,34 +146033,6 @@ self: { }: mkDerivation { pname = "io-streams"; - version = "1.5.1.0"; - sha256 = "1c7byr943x41nxpc3bnz152fvfbmakafq2958wyf9qiyp2pz18la"; - revision = "1"; - editedCabalFile = "0n0qs5lgryh3zxy73j3qbpnxand43yd2bj6pclvyii8apqqp901a"; - configureFlags = [ "-fnointeractivetests" ]; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-builder network primitive - process text time transformers vector zlib-bindings - ]; - testHaskellDepends = [ - attoparsec base bytestring bytestring-builder deepseq directory - filepath HUnit mtl network primitive process QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text - time transformers vector zlib zlib-bindings - ]; - description = "Simple, composable, and easy-to-use stream I/O"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "io-streams_1_5_2_0" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder - , deepseq, directory, filepath, HUnit, mtl, network, primitive - , process, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers, vector - , zlib, zlib-bindings - }: - mkDerivation { - pname = "io-streams"; version = "1.5.2.0"; sha256 = "1hbabrk5145d77qi23688piaf1wc93n8vaj846n0s3zk953z1lk3"; configureFlags = [ "-fnointeractivetests" ]; @@ -146026,7 +146048,6 @@ self: { ]; description = "Simple, composable, and easy-to-use stream I/O"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "io-streams-haproxy" = callPackage @@ -146318,22 +146339,24 @@ self: { "ipfs" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, directory-tree - , doctest, envy, flow, Glob, ip, lens, lens-aeson, monad-logger - , QuickCheck, regex-compat, rio, servant-client, servant-server - , swagger2, text, vector, yaml + , doctest, envy, flow, Glob, http-media, ip, lens, lens-aeson + , monad-logger, QuickCheck, regex-compat, rio, servant + , servant-client, servant-server, swagger2, text, vector, yaml }: mkDerivation { pname = "ipfs"; - version = "1.1.3"; - sha256 = "0ndd4015s5mp2cxwg85zly8xw0wfpx2da9jj6p0hh015whk8p2fm"; + version = "1.1.5.0"; + sha256 = "050zj21m4pg8jnpd594p2wc5m3nn4j6cmmv0069mi7kg473dqz2m"; libraryHaskellDepends = [ - aeson base bytestring envy flow Glob ip lens monad-logger - regex-compat rio servant-client servant-server swagger2 text vector + aeson base bytestring envy flow Glob http-media ip lens + monad-logger regex-compat rio servant servant-client servant-server + swagger2 text vector ]; testHaskellDepends = [ aeson base bytestring directory directory-tree doctest envy flow - Glob ip lens lens-aeson monad-logger QuickCheck regex-compat rio - servant-client servant-server swagger2 text vector yaml + Glob http-media ip lens lens-aeson monad-logger QuickCheck + regex-compat rio servant servant-client servant-server swagger2 + text vector yaml ]; description = "Access IPFS locally and remotely"; license = stdenv.lib.licenses.agpl3Plus; @@ -147891,8 +147914,8 @@ self: { }: mkDerivation { pname = "ixset-typed-conversions"; - version = "0.1.1.1"; - sha256 = "1fs0yys0hv9a2d8cxk94c89qp3843qqhjd47qvs50mxj1l22mc57"; + version = "0.1.2.0"; + sha256 = "15hxis8m60kfxi65k4sq2wica65whh8l1axw8jkx37yh1fys520x"; libraryHaskellDepends = [ base exceptions free hashable ixset-typed unordered-containers zipper-extra @@ -149485,15 +149508,13 @@ self: { "json-bytes-builder" = callPackage ({ mkDerivation, aeson, base, base-prelude, bytestring, criterion - , rebase, scientific, semigroups, text + , rebase, scientific, text }: mkDerivation { pname = "json-bytes-builder"; - version = "0.5.2"; - sha256 = "1a7bak30av58739wsxqv8p11nb3ljpj3xfd43yc563z5s3qnchqk"; - libraryHaskellDepends = [ - base base-prelude bytestring scientific semigroups text - ]; + version = "0.5.2.1"; + sha256 = "1h4wnjs1rjl1aq0ldsxmdcxvxgn2c3815640d5dn6ibf2fwlrd3f"; + libraryHaskellDepends = [ base bytestring scientific text ]; testHaskellDepends = [ base-prelude bytestring text ]; benchmarkHaskellDepends = [ aeson criterion rebase ]; description = "Direct-to-bytes JSON Builder"; @@ -152689,6 +152710,25 @@ self: { broken = true; }) {}; + "kmonad" = callPackage + ({ mkDerivation, base, cereal, lens, megaparsec, mtl + , optparse-applicative, resourcet, rio, time, unix, unliftio + }: + mkDerivation { + pname = "kmonad"; + version = "0.4.1"; + sha256 = "1l9980q74q98x9z8xj37bsnc6ywv362cap27n2nwjyc8wsihhc8c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cereal lens megaparsec mtl optparse-applicative resourcet rio + time unix unliftio + ]; + executableHaskellDepends = [ base ]; + description = "Advanced keyboard remapping utility"; + license = stdenv.lib.licenses.mit; + }) {}; + "kmp-dfa" = callPackage ({ mkDerivation, array, base, QuickCheck }: mkDerivation { @@ -153622,8 +153662,8 @@ self: { }: mkDerivation { pname = "lambda-options"; - version = "1.1.0.0"; - sha256 = "0ihbwml2l4jyd3h2kj5qz7fxzzkq47xk4fkybhp1rnfzxjlqfib3"; + version = "1.1.0.1"; + sha256 = "1lffzazcv3r14fsymkng6l10g65z1brsg8ghz4w4jplilp2i8ly2"; libraryHaskellDepends = [ base containers funspection mtl read-bounded ]; @@ -154724,8 +154764,8 @@ self: { }: mkDerivation { pname = "language-dickinson"; - version = "1.3.0.2"; - sha256 = "1dldip54xd54kbfgc3kl79z86p6c4q37vx43r3qpymxpc85kid84"; + version = "1.3.0.3"; + sha256 = "1bgcczk8v3gfrh44hsqmw7an7998yvn0dgla3rc0kr0xs7zsgp62"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -158481,6 +158521,36 @@ self: { broken = true; }) {}; + "libjwt-typed" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, casing + , containers, criterion, data-default, deepseq, either, exceptions + , extra, hspec, hspec-core, jose, jwt, lens, monad-time, proxied + , QuickCheck, quickcheck-instances, text, time, transformers + , unordered-containers, utf8-string, uuid + }: + mkDerivation { + pname = "libjwt-typed"; + version = "0.1"; + sha256 = "0w0snz2gbdx6csp85bwwga57v1dpz53q2dkhkmmmzrl29jbix9h3"; + libraryHaskellDepends = [ + base bytestring case-insensitive casing data-default either + exceptions extra monad-time proxied text time transformers + unordered-containers utf8-string uuid + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default either exceptions + extra hspec hspec-core jwt monad-time QuickCheck + quickcheck-instances text time transformers uuid + ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion data-default deepseq either + exceptions extra jose lens monad-time QuickCheck text time + transformers unordered-containers uuid + ]; + description = "A Haskell implementation of JSON Web Token (JWT)"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "liblastfm" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers , cryptonite, hspec, hspec-expectations-lens, http-client @@ -160827,6 +160897,8 @@ self: { pname = "liquidhaskell"; version = "0.8.10.2"; sha256 = "0byh5lia3kb44sgmilya881dp9il3n5qvrn16brnkvl9xhr9rdyi"; + revision = "1"; + editedCabalFile = "13xzhr99z459h6kd7h9y3pyyjnvsxwapjiayjr3yq2nyqhpyjygw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -163916,6 +163988,24 @@ self: { broken = true; }) {}; + "lti13" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, http-client + , http-types, jose-jwt, oidc-client, safe-exceptions, text + }: + mkDerivation { + pname = "lti13"; + version = "0.1.2.1"; + sha256 = "0fs8hj07b9p8m4y8jzmh0ny5x8fnxx75yb8kyk8slc6fjg8ybzlm"; + libraryHaskellDepends = [ + aeson base bytestring containers http-client http-types jose-jwt + oidc-client safe-exceptions text + ]; + description = "Core functionality for LTI 1.3."; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ltiv1p1" = callPackage ({ mkDerivation, authenticate-oauth, base, blaze-builder , bytestring, containers, data-default, http-client, http-types @@ -164553,8 +164643,8 @@ self: { }: mkDerivation { pname = "lz4-frame-conduit"; - version = "0.1.0.0"; - sha256 = "0nvvf42m4vbadl869hgyqrzbzbxp9q7rlbrldi4y6zw48ig21r1d"; + version = "0.1.0.1"; + sha256 = "0n07cgdwq2miskgqj354hnjghmp555d7n8b39b00sjigdjzkbala"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173656,14 +173746,14 @@ self: { }) {}; "monad-supply" = callPackage - ({ mkDerivation, base, mtl }: + ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "monad-supply"; - version = "0.7"; - sha256 = "1786rj4n0rrjpp07gn2y8vwpf6ijkjaim1q34rq7lvbjx1fhr2z5"; - libraryHaskellDepends = [ base mtl ]; + version = "0.9"; + sha256 = "1jknppcw8r0fpqnrgw1y8xjyx5xifzl1dkc0s2ffwkgij4x75saa"; + libraryHaskellDepends = [ base mtl transformers ]; description = "Stateful supply monad"; - license = stdenv.lib.licenses.mit; + license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -174907,7 +174997,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "morpheus-graphql_0_14_1" = callPackage + "morpheus-graphql_0_15_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, megaparsec , morpheus-graphql-core, mtl, scientific, tasty, tasty-hunit , template-haskell, text, transformers, unliftio-core @@ -174915,8 +175005,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.14.1"; - sha256 = "1vyb3jqnsmsjyl3zc0rh3c77ma3s5pgcqph4ijafhlm44fk6s82z"; + version = "0.15.1"; + sha256 = "1vk1rzrham61pnn5c77rvrn0zb02hc1birxdnyz80sjdap5fk8in"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers megaparsec morpheus-graphql-core @@ -174962,8 +175052,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.14.1"; - sha256 = "0q5cb5db1fdnp685jkmary43m6l4w8bhlqs5zh4h0q1lmkfz13n8"; + version = "0.15.1"; + sha256 = "1gmyil518qjn5l30kljrm52fznkib1d1qyxnjhyb535jc9f44zhz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring morpheus-graphql-core mtl template-haskell @@ -175003,7 +175093,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "morpheus-graphql-core_0_14_1" = callPackage + "morpheus-graphql-core_0_15_1" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, hashable , megaparsec, mtl, scientific, tasty, tasty-hunit, template-haskell , text, th-lift-instances, transformers, unordered-containers @@ -175011,8 +175101,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-core"; - version = "0.14.1"; - sha256 = "0xqam41z0i9f2bsa8z7gh3x2fhvy8qa02a1r4gix7dnymi69bbgj"; + version = "0.15.1"; + sha256 = "0nakm33ybrj8y3ci0a4697dvz8q38z17vr2mkcbm7h14h06kg8wr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring hashable megaparsec mtl scientific @@ -182609,8 +182699,8 @@ self: { }: mkDerivation { pname = "niv"; - version = "0.2.17"; - sha256 = "0qra7rrak3g2r8irbfib6j3jdcaw8d0j6y5k12clpcn8iv0d5bgf"; + version = "0.2.18"; + sha256 = "1jgljmj7msix2vn9nxip9q4754hx4739w4r7sa05l6q4ba5ilwqd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -185342,8 +185432,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ocap-io"; - version = "0.1.0.0"; - sha256 = "0cdxdi7rllkc4f0qi73xgz5jz2h936hnzashwz3hv82br8482lyv"; + version = "0.1.1.0"; + sha256 = "07s3nman83mv6g96naz0aax6pn6h6vrw3linv46895rvfz4vak8k"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Object capability based IO"; @@ -186316,6 +186406,8 @@ self: { pname = "opaleye"; version = "0.7.1.0"; sha256 = "0i4ndy9dd6jb4dzx8a5fv8jsmnmp7p1kx2qr012xj1qjq36sqpy6"; + revision = "1"; + editedCabalFile = "1kcgpigl645m1n7ikxx4lnnlqmwh06kndg6mbz69rn5ir7qimv51"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -187097,27 +187189,6 @@ self: { }: mkDerivation { pname = "openssl-streams"; - version = "1.2.2.0"; - sha256 = "0rplym6ayydkpr7x9mw3l13p0vzzfzzxw244d7sd3jcvaxpv0rmr"; - revision = "1"; - editedCabalFile = "125bxb2axgpcq7rrpamfq0yz017i0ks9zsykh6hn0ifw3lxj1k29"; - libraryHaskellDepends = [ - base bytestring HsOpenSSL io-streams network - ]; - testHaskellDepends = [ - base bytestring HsOpenSSL HUnit io-streams network test-framework - test-framework-hunit - ]; - description = "OpenSSL network support for io-streams"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "openssl-streams_1_2_3_0" = callPackage - ({ mkDerivation, base, bytestring, HsOpenSSL, HUnit, io-streams - , network, test-framework, test-framework-hunit - }: - mkDerivation { - pname = "openssl-streams"; version = "1.2.3.0"; sha256 = "10pnnpzgb5xr811kc9qdk7h2cgn6hk2yiyhnzz8f8p0fjzc0pwjm"; libraryHaskellDepends = [ @@ -187129,7 +187200,6 @@ self: { ]; description = "OpenSSL network support for io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentelemetry" = callPackage @@ -188777,6 +188847,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "orthotope" = callPackage + ({ mkDerivation, base, deepseq, dlist, HUnit, pretty, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , vector + }: + mkDerivation { + pname = "orthotope"; + version = "0.1.0.0"; + sha256 = "0nx97r1svhzayf0f4chj8mprqp524hliffnw5y612lwsx41c671k"; + libraryHaskellDepends = [ + base deepseq dlist pretty QuickCheck vector + ]; + testHaskellDepends = [ + base deepseq HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 vector + ]; + description = "Multidimensional arrays inspired by APL"; + license = stdenv.lib.licenses.asl20; + }) {}; + "os-release" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, hspec , hspec-megaparsec, megaparsec, pretty-simple, safe-exceptions @@ -192534,28 +192624,28 @@ self: { }) {}; "patat" = callPackage - ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, async, base , base64-bytestring, bytestring, colour, containers, directory , filepath, mtl, network, network-uri, optparse-applicative, pandoc - , process, QuickCheck, skylighting, tasty, tasty-hunit - , tasty-quickcheck, terminal-size, text, time, unordered-containers - , yaml + , pandoc-types, process, QuickCheck, skylighting, tasty + , tasty-hunit, tasty-quickcheck, terminal-size, text, time + , unordered-containers, yaml }: mkDerivation { pname = "patat"; - version = "0.8.5.0"; - sha256 = "1b4g5m32dv7905q51p4f23c9d4sfy5jvwbq7wgwsa2mwl8hf5cds"; + version = "0.8.6.1"; + sha256 = "1n9qw4wmh7aqmnkqdc6v12rs80vipnszr4744nlkasq6jlzijw0c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base base64-bytestring + aeson ansi-terminal ansi-wl-pprint async base base64-bytestring bytestring colour containers directory filepath mtl network - network-uri optparse-applicative pandoc process skylighting - terminal-size text time unordered-containers yaml + network-uri optparse-applicative pandoc pandoc-types process + skylighting terminal-size text time unordered-containers yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base directory QuickCheck tasty tasty-hunit tasty-quickcheck + base directory QuickCheck tasty tasty-hunit tasty-quickcheck text ]; description = "Terminal-based presentations using Pandoc"; license = stdenv.lib.licenses.gpl2; @@ -195052,6 +195142,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "persistent-qq_2_9_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, fast-logger + , haskell-src-meta, hspec, HUnit, monad-logger, mtl, persistent + , persistent-sqlite, persistent-template, resourcet + , template-haskell, text, unliftio + }: + mkDerivation { + pname = "persistent-qq"; + version = "2.9.2"; + sha256 = "1nks3b420g447i3bvlpf3f41ry8jkfkl60m9yl48vyxgbpcjq523"; + libraryHaskellDepends = [ + base haskell-src-meta mtl persistent template-haskell text + ]; + testHaskellDepends = [ + aeson base bytestring fast-logger haskell-src-meta hspec HUnit + monad-logger mtl persistent persistent-sqlite persistent-template + resourcet template-haskell text unliftio + ]; + description = "Provides a quasi-quoter for raw SQL for persistent"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-ratelimit" = callPackage ({ mkDerivation, base, time, yesod }: mkDerivation { @@ -195692,8 +195805,8 @@ self: { ({ mkDerivation, base, containers, gu, pgf, pretty }: mkDerivation { pname = "pgf2"; - version = "1.2.0"; - sha256 = "1lw9wdsvlasd5x323dficcmzqf48yz49wd3v64gsyx60sw93vn0y"; + version = "1.2.1"; + sha256 = "10nbwhdirhlsh68f14z8y75wlbs9f9xcn8cbgkf47m74x71jqqb3"; libraryHaskellDepends = [ base containers pretty ]; librarySystemDepends = [ gu pgf ]; description = "Bindings to the C version of the PGF runtime"; @@ -198743,8 +198856,8 @@ self: { }: mkDerivation { pname = "plugins"; - version = "1.6.0"; - sha256 = "0wbmvcb2j4qi29yrmvjfhdf8251lam5yiqshk9gf6dlprz2kvww1"; + version = "1.6.1"; + sha256 = "004mfq0d10s26sgk12zrhgmxcfxnhvdyajr48scxf5rh1fv9440i"; libraryHaskellDepends = [ array base Cabal containers directory filepath ghc ghc-paths ghc-prim haskell-src process random split @@ -199584,7 +199697,7 @@ self: { }) {}; "polysemy-http" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring + ({ mkDerivation, aeson, ansi-terminal, base, bytestring , case-insensitive, co-log-core, co-log-polysemy, composition , containers, data-default, either, hedgehog, http-client , http-client-tls, http-conduit, http-types, lens, network @@ -199594,20 +199707,19 @@ self: { }: mkDerivation { pname = "polysemy-http"; - version = "0.2.0.2"; - sha256 = "0ahanslhdidday6ykfcw1yshjp5yjzx5wlwwdy3csr67mnxxs44y"; + version = "0.2.0.3"; + sha256 = "10a0sihivgxn7w1m9rj6dbs9wiw6gmcf7qg0s2bnd3d4ipxxy89q"; libraryHaskellDepends = [ - aeson ansi-terminal base-noprelude bytestring case-insensitive - co-log-core co-log-polysemy composition containers data-default - either http-client http-client-tls http-conduit http-types lens - polysemy polysemy-plugin relude string-interpolate template-haskell - text + aeson ansi-terminal base bytestring case-insensitive co-log-core + co-log-polysemy composition containers data-default either + http-client http-client-tls http-conduit http-types lens polysemy + polysemy-plugin relude string-interpolate template-haskell text ]; testHaskellDepends = [ - aeson ansi-terminal base-noprelude bytestring case-insensitive - co-log-core co-log-polysemy composition containers data-default - either hedgehog http-client http-client-tls http-conduit http-types - lens network polysemy polysemy-plugin relude servant servant-client + aeson ansi-terminal base bytestring case-insensitive co-log-core + co-log-polysemy composition containers data-default either hedgehog + http-client http-client-tls http-conduit http-types lens network + polysemy polysemy-plugin relude servant servant-client servant-server string-interpolate tasty tasty-hedgehog template-haskell text warp ]; @@ -199638,8 +199750,8 @@ self: { }: mkDerivation { pname = "polysemy-plugin"; - version = "0.2.5.0"; - sha256 = "1ymry3ppc5cl9agvkbxks155xnxr9cv39p77j05ychnhv9r4vjsh"; + version = "0.2.5.1"; + sha256 = "14iz5p5g57ki9lbjyy8i3lx7xk2qmrc8dqkd94jrbilsvn4m5gf3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers ghc ghc-tcplugins-extra polysemy syb transformers @@ -200780,7 +200892,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "postgresql-binary_0_12_3" = callPackage + "postgresql-binary_0_12_3_1" = callPackage ({ mkDerivation, aeson, base, base-prelude, binary-parser , bytestring, bytestring-strict-builder, containers, conversion , conversion-bytestring, conversion-text, criterion, json-ast @@ -200791,8 +200903,8 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.12.3"; - sha256 = "0z31d7bw7m43195maqw5pba3l2l98nnkck0gzaghk05id0p7rlmd"; + version = "0.12.3.1"; + sha256 = "0frdyhzdrfnrqmf15all0g817p7i6asj46hzk87rw52qbfiyag2v"; libraryHaskellDepends = [ aeson base base-prelude binary-parser bytestring bytestring-strict-builder containers loch-th network-ip @@ -202965,20 +203077,21 @@ self: { maintainers = with stdenv.lib.maintainers; [ cdepillabout ]; }) {}; - "pretty-simple_3_3_0_0" = callPackage - ({ mkDerivation, ansi-terminal, base, Cabal, cabal-doctest - , containers, criterion, doctest, Glob, mtl, QuickCheck - , template-haskell, text, transformers + "pretty-simple_4_0_0_0" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers, criterion + , doctest, Glob, mtl, prettyprinter, prettyprinter-ansi-terminal + , QuickCheck, template-haskell, text, transformers }: mkDerivation { pname = "pretty-simple"; - version = "3.3.0.0"; - sha256 = "0g83958npqscqqz2lh5m0m666qp8ldwps4l5gvfip4b1zgy3f5nh"; + version = "4.0.0.0"; + sha256 = "1srvx854ml2gffnkxr2fm12xk8syjsk078rfzrq0a3idwgv46myw"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - ansi-terminal base containers mtl text transformers + base containers mtl prettyprinter prettyprinter-ansi-terminal text + transformers ]; testHaskellDepends = [ base doctest Glob QuickCheck template-haskell @@ -204387,14 +204500,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "product-profunctors_0_11_0_0" = callPackage + "product-profunctors_0_11_0_1" = callPackage ({ mkDerivation, base, bifunctors, contravariant, criterion , deepseq, profunctors, tagged, template-haskell }: mkDerivation { pname = "product-profunctors"; - version = "0.11.0.0"; - sha256 = "1jx427xixykq9h353r7izd5nx1hpzc7g0hz4pcx6hnd0ql2d644a"; + version = "0.11.0.1"; + sha256 = "0lwwjnpxgkgk02179j8jj9c1zvaw4f406i9gm7ngqczl8y796q3l"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell ]; @@ -205141,8 +205254,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.11"; - sha256 = "0jda99g9a818w1yisms40rlzx81dyvv16w2ms8iazs5b9h4fwb3a"; + version = "5.12"; + sha256 = "0j2w2j6df965fhh828y6x55p70wi4r7plrlzzgzxxhq0lhjdjyr0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206106,8 +206219,8 @@ self: { }: mkDerivation { pname = "psql-utils"; - version = "0.2.0.0"; - sha256 = "0y195pymiy31d8pyq71hjrh58s3hfzaa58l7qskbf3biyy159sxz"; + version = "0.2.0.1"; + sha256 = "0vqi45v5ghv36gqmqc0ddhm4rwc0zg9qckl0bf7klwiiczs52smq"; libraryHaskellDepends = [ aeson base hashable postgresql-simple resource-pool time ]; @@ -207117,15 +207230,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pusher-http-haskell_2_0_0_0" = callPackage + "pusher-http-haskell_2_0_0_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , cryptonite, hashable, hspec, http-client, http-client-tls , http-types, memory, QuickCheck, text, time, unordered-containers }: mkDerivation { pname = "pusher-http-haskell"; - version = "2.0.0.0"; - sha256 = "0q13lq2bjhw2mwsla1m6h1l6bhrwsy6iin7cprqh9bjjaqmq4dxi"; + version = "2.0.0.1"; + sha256 = "05f4p4rnx2gy1f17d83sfpnxrfniq710pyai97gwi4ks3f4avk5a"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-client-tls http-types memory text time @@ -208386,22 +208499,6 @@ self: { "quickcheck-classes-base" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, containers - , contravariant, fail, QuickCheck, semigroups, tagged, transformers - }: - mkDerivation { - pname = "quickcheck-classes-base"; - version = "0.6.0.0"; - sha256 = "193jbr3fy2451gx0hzw82xrzxp6mxz5ics6yaybbz1a3dhlz53yx"; - libraryHaskellDepends = [ - base base-orphans bifunctors containers contravariant fail - QuickCheck semigroups tagged transformers - ]; - description = "QuickCheck common typeclasses from `base`"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-classes-base_0_6_1_0" = callPackage - ({ mkDerivation, base, base-orphans, bifunctors, containers , contravariant, fail, QuickCheck, tagged, transformers }: mkDerivation { @@ -208414,7 +208511,6 @@ self: { ]; description = "QuickCheck common typeclasses from `base`"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-combinators" = callPackage @@ -211902,8 +211998,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "read-bounded"; - version = "0.1.1.2"; - sha256 = "1h525al4aavplyimhxsvk96cajl8m7rnlqq3wxh9gqlc1sy4ywcg"; + version = "0.1.1.3"; + sha256 = "0b2syhxan3fpf9h1zq3izpb8bgsl4qrk975afy3r2ji6dhjq81cl"; libraryHaskellDepends = [ base ]; description = "Class for reading bounded values"; license = stdenv.lib.licenses.bsd3; @@ -212317,7 +212413,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rebase_1_7_1_1" = callPackage + "rebase_1_7_3" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, contravariant-extras, deepseq, dlist, either , hashable, mtl, profunctors, scientific, selective, semigroupoids @@ -212326,8 +212422,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.7.1.1"; - sha256 = "1hyh4b5dqp3lkfyafv6zm41vw9mnpvw6gb9ypwh6lwx64yipzmlx"; + version = "1.7.3"; + sha256 = "0w5ywvwq4m2jw5rrlvxwnczwnxx5gkzdlbji85n0crcsqkhkmn1i"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant contravariant-extras deepseq dlist either hashable mtl profunctors @@ -216553,12 +216649,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rerebase_1_7_1_1" = callPackage + "rerebase_1_7_3" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.7.1.1"; - sha256 = "0jvvyqridkbcgyfisvc5c3116d2asph3vim72mvgwbd1ijs101y7"; + version = "1.7.3"; + sha256 = "0ynvpawhjwbw3231nlwpk5x5wwbzpx1iw66vs97wpk5b8p1bhrld"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; @@ -218284,8 +218380,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.18.0"; - sha256 = "11f1cxa9c90d7hgqn9bl08l499n2dzdj31f9pw9acb1nrlx5hik8"; + version = "0.1.19.0"; + sha256 = "04kvpirwz86pj7izaa0la601xyqnqzsspg43z10vxnc1whjp5rsm"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath hashable microlens microlens-mtl mtl primitive process text time @@ -218760,6 +218856,27 @@ self: { broken = true; }) {}; + "roboservant" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hedgehog, mtl + , servant, servant-client, servant-flatten, servant-server + , string-conversions + }: + mkDerivation { + pname = "roboservant"; + version = "0.1.0.2"; + sha256 = "1dbzwczmjms6phzf3r6igy1q33gkwsdirdabd2rr0i2qp0lynshv"; + libraryHaskellDepends = [ + base bytestring containers hedgehog mtl servant servant-client + servant-flatten servant-server string-conversions + ]; + testHaskellDepends = [ + aeson base bytestring containers hedgehog mtl servant + servant-client servant-flatten servant-server string-conversions + ]; + description = "Automatic session-aware servant testing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "robot" = callPackage ({ mkDerivation, base, containers, exceptions, transformers, xhb }: mkDerivation { @@ -219698,19 +219815,19 @@ self: { }) {}; "row-types" = callPackage - ({ mkDerivation, base, constraints, criterion, deepseq - , generic-lens, hashable, profunctors, text, unordered-containers + ({ mkDerivation, base, constraints, deepseq, gauge, generic-lens + , hashable, profunctors, text, unordered-containers }: mkDerivation { pname = "row-types"; - version = "0.4.0.0"; - sha256 = "146wcmy65wls6s8z333z9xqdb0m89dwjbfd9vshldkd1g9kgbck7"; + version = "1.0.0.0"; + sha256 = "03qavr0d3ivap1n9nq7ks7yiappmzvirczi796y1krm0kgi25djy"; libraryHaskellDepends = [ base constraints deepseq generic-lens hashable profunctors text unordered-containers ]; testHaskellDepends = [ base generic-lens ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; + benchmarkHaskellDepends = [ base deepseq gauge ]; description = "Open Records and Variants"; license = stdenv.lib.licenses.mit; }) {}; @@ -219844,15 +219961,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rpmbuild-order_0_4_2_1" = callPackage + "rpmbuild-order_0_4_3" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , directory, extra, fgl, filepath, hspec, optparse-applicative , process, simple-cmd, simple-cmd-args, unix }: mkDerivation { pname = "rpmbuild-order"; - version = "0.4.2.1"; - sha256 = "148wxcglf4jiz5s2ybw9ija33vzp0cg619dxncsmjsn9lz4c8gcf"; + version = "0.4.3"; + sha256 = "19aszn4fcsxbzciswrb80qvm6r3x28kyl7g5m3c1569f0ib3rbg6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220940,15 +221057,15 @@ self: { }) {}; "safe-tensor" = callPackage - ({ mkDerivation, base, constraints, containers, hmatrix, mtl - , singletons + ({ mkDerivation, base, constraints, containers, deepseq, hmatrix + , mtl, singletons }: mkDerivation { pname = "safe-tensor"; - version = "0.2.0.0"; - sha256 = "04fafmypwcw88qqb9v9lalfyyqna68b3brx2rmry7i4898gwasp8"; + version = "0.2.1.0"; + sha256 = "00s8p7bp72wjpz4mbxn79xg6cllyl2c6fn952w2nykyrapzpxhxm"; libraryHaskellDepends = [ - base constraints containers hmatrix mtl singletons + base constraints containers deepseq hmatrix mtl singletons ]; description = "Dependently typed tensor algebra"; license = stdenv.lib.licenses.mit; @@ -228487,7 +228604,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "serverless-haskell_0_12_1" = callPackage + "serverless-haskell_0_12_2" = callPackage ({ mkDerivation, aeson, aeson-casing, amazonka-core , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive , hspec, hspec-discover, http-client, http-types, iproute, lens @@ -228496,8 +228613,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.12.1"; - sha256 = "0a9df4mxl73wbyf9mvbrczmcn0vvf8yn3p4wb9ggf29x4ls22zg8"; + version = "0.12.2"; + sha256 = "0x61rqv7w0qjnjpkd1hsy1ixdnxv5abicfdglsr62nazhchnh717"; libraryHaskellDepends = [ aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-client http-types iproute lens @@ -233322,14 +233439,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_10" = callPackage + "skylighting_0_10_0_2" = callPackage ({ mkDerivation, base, binary, blaze-html, bytestring, containers , directory, filepath, pretty-show, skylighting-core, text }: mkDerivation { pname = "skylighting"; - version = "0.10"; - sha256 = "1gi6pfi5rcmql0gdcjyb114phkc0xnkrhk6y2h6yvx4jflzpw4lj"; + version = "0.10.0.2"; + sha256 = "0m2z4hmv2m6h6kmvn8n3fskwyhq6pj28bjfvs61qg9pnga3xbf26"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; @@ -233377,7 +233494,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "skylighting-core_0_10" = callPackage + "skylighting-core_0_10_0_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory @@ -233387,8 +233504,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.10"; - sha256 = "1b2ldgdgq0a1wg7nlfpzm1rag8hbmm7gnirrm78cd72kycrmly60"; + version = "0.10.0.2"; + sha256 = "07gdvmz8lvqkzzgnxakx015g2ijmqd2jmni1phz6x79xf9q7s5vw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -234066,18 +234183,19 @@ self: { "smallcheck-series" = callPackage ({ mkDerivation, base, bytestring, containers, doctest, Glob - , logict, smallcheck, text, transformers + , logict, smallcheck, tasty, tasty-hunit, tasty-smallcheck, text + , transformers }: mkDerivation { pname = "smallcheck-series"; - version = "0.6.1"; - sha256 = "07kjbci4wxi6g9m0k0fqpxm8p2kxspyrcmg175vb3bp008vqb931"; - revision = "2"; - editedCabalFile = "1944nax2aq32cd8i335nc511zis3lcwkclkh5caigsfs34kwwglg"; + version = "0.7.0.0"; + sha256 = "11pb4k0y8fqfkq5ajspn5nnliskvk8qp02dzpcjrzqk27da2iwb6"; libraryHaskellDepends = [ base bytestring containers logict smallcheck text transformers ]; - testHaskellDepends = [ base doctest Glob ]; + testHaskellDepends = [ + base doctest Glob smallcheck tasty tasty-hunit tasty-smallcheck + ]; description = "Extra SmallCheck series and utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -234290,8 +234408,8 @@ self: { ({ mkDerivation, base, lens, smash }: mkDerivation { pname = "smash-lens"; - version = "0.1.0.0"; - sha256 = "05f2swr4qv3x12fwpyxa0ph90awgf484gn9y8rlxlvql0h213rnm"; + version = "0.1.0.1"; + sha256 = "1j7v3713aahp3vh7dswrkdfrnksi1zlw9iv9zanhb714s6anyq66"; libraryHaskellDepends = [ base lens smash ]; testHaskellDepends = [ base ]; description = "Optics for the `smash` library"; @@ -234314,12 +234432,10 @@ self: { ({ mkDerivation, base, optics-core, smash }: mkDerivation { pname = "smash-optics"; - version = "0.1.0.0"; - sha256 = "0h8khdm2lgklmf73bshfrjqfmkmhrbr6cq2r11vsm0lqfkzlyndh"; - revision = "1"; - editedCabalFile = "1kzkznb0167krv5pcia2vsj0gy9zgykjhqg5d3pfnwz3152197ql"; + version = "0.1.0.1"; + sha256 = "1jf60vx8hlmyjgap91fvwn0p0hnazpcimshhkz5lsys0ynd4pcwh"; libraryHaskellDepends = [ base optics-core smash ]; - description = "Optics for the `smash` library"; + description = "Optics for the `smash` library using `optics-core`"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -237922,8 +238038,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "spherical"; - version = "0.1.2.2"; - sha256 = "014fmxgzymyfa82qabc90avjyv4yp7c0s88kkmp02pvpkmjd6p24"; + version = "0.1.3.0"; + sha256 = "1h014k4yi0aachbbni011a1jkzi31lrxhpi8h5q5f2vkgb18k1g4"; libraryHaskellDepends = [ base composition-prelude ]; description = "Geometry on a sphere"; license = stdenv.lib.licenses.bsd3; @@ -238183,8 +238299,8 @@ self: { ({ mkDerivation, base, containers, ghc, hlint, stm }: mkDerivation { pname = "splint"; - version = "1.0.1.1"; - sha256 = "14rwj7dbzg01lv4abwrgxjianwnshnycsmxcckw1hhqc8wx9jdac"; + version = "1.0.1.2"; + sha256 = "0b7czphkra6q6a5xm30pjh5b4cdvz87fzb2pv17dpxai0mb3c0r6"; libraryHaskellDepends = [ base containers ghc hlint stm ]; description = "HLint as a GHC source plugin"; license = stdenv.lib.licenses.isc; @@ -242115,15 +242231,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_59_0" = callPackage + "stratosphere_0_59_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.59.0"; - sha256 = "0k9xynh0qbnbif78air5dn6ndk3bydnbkcx0ny0hbcx1p2x3fifn"; + version = "0.59.1"; + sha256 = "1gcvz8gpyj495jr5qa2jx2yay7ip3hs1dd4bqckmam8llyz2gvxv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -242991,8 +243107,8 @@ self: { }: mkDerivation { pname = "streamly-lmdb"; - version = "0.0.1.1"; - sha256 = "080w7c9dgw4dixnxhvpjnii53c5sk00h18vwps973q51qhl9qa18"; + version = "0.1.0"; + sha256 = "0yccaszb6fbasmlwq3iqci7gin8kf7hgmlcjfsq0pdqw32lnmcbn"; libraryHaskellDepends = [ async base bytestring streamly ]; librarySystemDepends = [ lmdb ]; testHaskellDepends = [ @@ -245172,16 +245288,18 @@ self: { "supernova" = callPackage ({ mkDerivation, aeson, async, base, bifunctor, binary, bytestring - , crc32c, exceptions, lens-family-core, logging, managed, network - , proto-lens, proto-lens-runtime, streamly, text, unliftio + , crc32c, exceptions, lens-family-core, lens-family-th, logging + , managed, mtl, network, proto-lens, proto-lens-runtime, streamly + , text }: mkDerivation { pname = "supernova"; - version = "0.0.2"; - sha256 = "0nqylb2qqqyxqw2f9smdl3hiv4kbi8hphxndp4v1yx3hq3zhdbjj"; + version = "0.0.3"; + sha256 = "1k04k71x42h56n6qzdcviya9alwxgch846l1xcl17zc34rs4p79v"; libraryHaskellDepends = [ - base bifunctor binary bytestring crc32c exceptions lens-family-core - logging managed network proto-lens proto-lens-runtime text unliftio + async base bifunctor binary bytestring crc32c exceptions + lens-family-core lens-family-th logging managed mtl network + proto-lens proto-lens-runtime text ]; testHaskellDepends = [ aeson async base bytestring streamly text ]; description = "Apache Pulsar client for Haskell"; @@ -245866,8 +245984,8 @@ self: { }: mkDerivation { pname = "swiss-ephemeris"; - version = "1.0.0.0"; - sha256 = "0sv53h1wy0yf32hkwywigl3hpjaabslk0v6m2y2b1lc1hxnavxnv"; + version = "1.2.0.0"; + sha256 = "1inzvwm7z562q07r5h8prxpn4g1ywza88a7rv95yx8634fcy1bsl"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -248690,8 +248808,8 @@ self: { }: mkDerivation { pname = "taskell"; - version = "1.10.0"; - sha256 = "14syiis60fds1r295d6nlvw0mn1d1d6ly0j69r9srbcbrbb2j7yw"; + version = "1.10.1"; + sha256 = "1s05jwsfzjvgfcyd4n4ykzxld11mkf5gnyd9crl5ry5pg77iqw72"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -263611,8 +263729,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "uniqueness-periods-vector-common"; - version = "0.2.0.0"; - sha256 = "1qnnydvfl1ylgd2j54jyq820404pq1477qqda70bbr6y5ax2as62"; + version = "0.3.0.0"; + sha256 = "1dw1j10ambqcjr42jb5p9kwdzpz943dw6pgiivxs41iq2w6nibp6"; libraryHaskellDepends = [ base vector ]; description = "Generalization of the dobutokO-poetry-general package functionality"; license = stdenv.lib.licenses.mit; @@ -263622,33 +263740,45 @@ self: { ({ mkDerivation, base, mmsyn6ukr, phonetic-languages-ukrainian , print-info, uniqueness-periods-vector , uniqueness-periods-vector-common + , uniqueness-periods-vector-filters , uniqueness-periods-vector-general , uniqueness-periods-vector-properties, vector }: mkDerivation { pname = "uniqueness-periods-vector-examples"; - version = "0.1.0.0"; - sha256 = "151gmyq6hx61hgq5inf939dbhlc8wb2y5bw43xx11rmv77ajkf14"; + version = "0.4.0.0"; + sha256 = "11f7kgsrz0d7hna02qpf519775w4kli7zxg8yp0d0zzi1yp1cgrq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base mmsyn6ukr phonetic-languages-ukrainian print-info uniqueness-periods-vector uniqueness-periods-vector-common - uniqueness-periods-vector-general + uniqueness-periods-vector-filters uniqueness-periods-vector-general uniqueness-periods-vector-properties vector ]; description = "Examples of usage for the uniqueness-periods-vector series of packages"; license = stdenv.lib.licenses.mit; }) {}; + "uniqueness-periods-vector-filters" = callPackage + ({ mkDerivation, base, mmsyn2, vector }: + mkDerivation { + pname = "uniqueness-periods-vector-filters"; + version = "0.1.1.0"; + sha256 = "1slwc94m62qp28g3bqbaa4x0zp0zz7x74kv41mcalzd79nlxf7cv"; + libraryHaskellDepends = [ base mmsyn2 vector ]; + description = "A library allows to change the structure of the 'RealFrac' function output"; + license = stdenv.lib.licenses.mit; + }) {}; + "uniqueness-periods-vector-general" = callPackage ({ mkDerivation, base, print-info, uniqueness-periods-vector-common , vector }: mkDerivation { pname = "uniqueness-periods-vector-general"; - version = "0.2.3.0"; - sha256 = "0nw03a751cyr9mw9qz0vdc284bwvw52ybw87wj3cm1l7if54qjwk"; + version = "0.4.2.0"; + sha256 = "1ixw5lf2p4wnjsm9989nvsp01aznirb2awhasvlbp0bhgqaj0zmq"; libraryHaskellDepends = [ base print-info uniqueness-periods-vector-common vector ]; @@ -264817,8 +264947,8 @@ self: { }: mkDerivation { pname = "up"; - version = "1.0.0.5"; - sha256 = "1b41pqj2v6j0vgj7j18wlparbbkvf92xcfr59lvgf9k8xvarl43k"; + version = "2.0.0.0"; + sha256 = "1m07w91dq5db5kjv5w4m5hvh6a19rv4m9vz3pq80zng2c1w4qyb8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -266008,15 +266138,16 @@ self: { }) {}; "uuagc" = callPackage - ({ mkDerivation, array, base, containers, directory, filepath - , ghc-prim, haskell-src-exts, mtl, uuagc-cabal, uulib + ({ mkDerivation, array, base, Cabal, containers, directory + , filepath, ghc-prim, haskell-src-exts, mtl, uuagc-cabal, uulib }: mkDerivation { pname = "uuagc"; - version = "0.9.52.2"; - sha256 = "1wqva95nmz9yx9b60jjwkpb73pq9m4g9l4iq739xnj6llwckpb8y"; + version = "0.9.53"; + sha256 = "0cij4kf8f2151xz2q935bn9bhrqig9alc008vds7cw6pkb32ngz6"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ array base containers directory filepath ghc-prim haskell-src-exts mtl uuagc-cabal uulib @@ -266058,8 +266189,8 @@ self: { }: mkDerivation { pname = "uuagc-cabal"; - version = "1.1.0.0"; - sha256 = "0bdvrxdbs9672gfmf3r2j2nasc7map2jr191crf1d0jhmg6dmlzj"; + version = "1.2.0.0"; + sha256 = "1hb567h06zdhrrysb99d0c63ih5p1ii2jl0ng2l304w71m35pk2z"; libraryHaskellDepends = [ base Cabal containers directory filepath mtl process uulib ]; @@ -266073,8 +266204,8 @@ self: { ({ mkDerivation, base, diagrams-lib, SVGFonts }: mkDerivation { pname = "uuagc-diagrams"; - version = "0.1.1.0"; - sha256 = "16sf4kbjgxsi3amdpr3nqg15f2gmjvf3w2wh6pn72zhjqsbnfnmz"; + version = "0.1.2.0"; + sha256 = "0x4dhbzl5xvs3mrg7256hg673nbr4k6kjszyavjs61klcq58asm7"; libraryHaskellDepends = [ base diagrams-lib SVGFonts ]; description = "Utility for drawing attribute grammar pictures with the diagrams package"; license = stdenv.lib.licenses.bsd3; @@ -269647,7 +269778,7 @@ self: { "wai-extra" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , bytestring, case-insensitive, containers, cookie + , bytestring, call-stack, case-insensitive, containers, cookie , data-default-class, deepseq, directory, fast-logger, hspec , http-types, http2, HUnit, iproute, network, old-locale, resourcet , streaming-commons, text, time, transformers, unix, unix-compat @@ -269655,12 +269786,12 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.29.2"; - sha256 = "00r65l7xmvhc1jx5fq134q1sysx7ja5dzyhv5x55gmnxmqr0p107"; + version = "3.0.31"; + sha256 = "1kyid5h7pssgqigmggvx6jh9ip848dkyaslnxi58hhddx0m50vs3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring bytestring + aeson ansi-terminal base base64-bytestring bytestring call-stack case-insensitive containers cookie data-default-class deepseq directory fast-logger http-types http2 iproute network old-locale resourcet streaming-commons text time transformers unix unix-compat @@ -279687,6 +279818,30 @@ self: { broken = true; }) {}; + "yesod-auth-lti13" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bytestring, containers, cryptonite, http-client, http-conduit + , jose-jwt, load-env, lti13, microlens, oidc-client, random + , safe-exceptions, text, time, warp, yesod, yesod-auth, yesod-core + }: + mkDerivation { + pname = "yesod-auth-lti13"; + version = "0.1.2.1"; + sha256 = "0p4z1vsbf55jc5ljwsdgbvji61554q3ngfn74klr2ddp87dn0fzr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring containers + cryptonite http-client http-conduit jose-jwt load-env lti13 + microlens oidc-client random safe-exceptions text time warp yesod + yesod-auth yesod-core + ]; + description = "A yesod-auth plugin for LTI 1.3"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "yesod-auth-nopassword" = callPackage ({ mkDerivation, base, blaze-markup, http-types, pwstore-fast, text , uuid, yesod-auth, yesod-core, yesod-form @@ -280972,22 +281127,6 @@ self: { "yesod-recaptcha2" = callPackage ({ mkDerivation, aeson, base, classy-prelude, http-conduit - , yesod-auth, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-recaptcha2"; - version = "1.0.0"; - sha256 = "1hg5g90ld4jc1ggi6rg0si35rr8r8dq79a221zjzs37hsla2cr7i"; - libraryHaskellDepends = [ - aeson base classy-prelude http-conduit yesod-auth yesod-core - yesod-form - ]; - description = "yesod recaptcha2"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-recaptcha2_1_0_1" = callPackage - ({ mkDerivation, aeson, base, classy-prelude, http-conduit , yesod-core, yesod-form }: mkDerivation { @@ -280999,7 +281138,6 @@ self: { ]; description = "yesod recaptcha2"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-routes" = callPackage @@ -283278,6 +283416,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zip_1_6_0" = callPackage + ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive + , cereal, conduit, conduit-extra, conduit-zstd, containers, digest + , directory, dlist, exceptions, filepath, hspec, monad-control, mtl + , QuickCheck, resourcet, temporary, text, time, transformers + , transformers-base + }: + mkDerivation { + pname = "zip"; + version = "1.6.0"; + sha256 = "1k00g2952yf3iyq1p6pjn307zsxsc9j3iq6lih3rr8vysiijivcx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra conduit-zstd containers digest directory dlist + exceptions filepath monad-control mtl resourcet text time + transformers transformers-base + ]; + executableHaskellDepends = [ base filepath ]; + testHaskellDepends = [ + base bytestring conduit containers directory dlist exceptions + filepath hspec QuickCheck temporary text time transformers + ]; + description = "Operations on zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, pretty, process diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index dc105c845d75b..32fa46fd04ace 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -105,18 +105,6 @@ symlinkJoin { --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" fi - # ghcide 0.2.0 does package discovery without calling our ghc wrapper. - # 2020-08-16 We can most likely remove this workaround as soon as we build ghcide with a newer hie-bios (currently we use 0.5.1 from stack) - for prg in ghcide; do - if [[ -x "$out/bin/$prg" ]]; then - wrapProgram $out/bin/$prg \ - --set "NIX_${ghcCommandCaps}" "$out/bin/${ghcCommand}" \ - --set "NIX_${ghcCommandCaps}PKG" "$out/bin/${ghcCommand}-pkg" \ - --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}" \ - --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}" - fi - done - '' + (lib.optionalString (stdenv.targetPlatform.isDarwin && !isGhcjs && !stdenv.targetPlatform.isiOS) '' # Work around a linker limit in macOS Sierra (see generic-builder.nix): local packageConfDir="$out/lib/${ghc.name}/package.conf.d"; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 53cef387ae447..39db54babe441 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, installShellFiles, jdk11, rlwrap, makeWrapper }: +{ stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }: stdenv.mkDerivation rec { pname = "clojure"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = let - binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ]; + binPath = stdenv.lib.makeBinPath [ rlwrap jdk ]; in '' mkdir -p $out/libexec diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index a53a917b7b376..18b658ae37ce6 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,6 +1,7 @@ { pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused , libxml2, libxslt, ncurses, openssl, perl, autoconf -, openjdk ? null # javacSupport +# TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731 +, openjdk8 ? null # javacSupport , unixODBC ? null # odbcSupport , libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport , parallelBuild ? false @@ -17,7 +18,7 @@ , enableThreads ? true , enableSmpSupport ? true , enableKernelPoll ? true -, javacSupport ? false, javacPackages ? [ openjdk ] +, javacSupport ? false, javacPackages ? [ openjdk8 ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] , wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] , preUnpack ? "", postUnpack ? "" @@ -36,7 +37,7 @@ assert wxSupport -> (if stdenv.isDarwin else libGL != null && libGLU != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; -assert javacSupport -> openjdk != null; +assert javacSupport -> openjdk8 != null; let inherit (stdenv.lib) optional optionals optionalAttrs optionalString; diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index 574629d8efd3b..d4e5f1b62bf7c 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ant, jdk, git, xorg, udev, libGL, libGLU }: +{ stdenv, fetchgit, ant, jdk8, git, xorg, udev, libGL, libGLU }: { jogl_2_3_2 = @@ -28,7 +28,8 @@ -exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \; ''; - nativeBuildInputs = [ jdk ant git ]; + # TODO: upgrade to jdk https://github.com/NixOS/nixpkgs/pull/89731 + nativeBuildInputs = [ jdk8 ant git ]; buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ]; buildPhase = '' diff --git a/pkgs/development/libraries/crcpp/default.nix b/pkgs/development/libraries/crcpp/default.nix new file mode 100644 index 0000000000000..c26578804baf3 --- /dev/null +++ b/pkgs/development/libraries/crcpp/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "crcpp"; + version = "1.0.1.0"; + + src = fetchFromGitHub { + owner = "d-bahr"; + repo = "CRCpp"; + rev = "release-${version}"; + sha256 = "138w97kfxnv8rcnvggba6fcxgbgq8amikkmy3jhqfn6xzy6zaimh"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/include + cp inc/CRC.h $out/include + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/d-bahr/CRCpp"; + description = "Easy to use and fast C++ CRC library"; + platforms = platforms.all; + maintainers = [ maintainers.ivar ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index 94d9776b54d27..d5e83f0410c44 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "cutelyst"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "1c4cjzx6jkqlblcfc7pkx66py43576y6rky19j7rjiap724q2yk9"; + sha256 = "1ngacc7ackp08hajby0xvzpvnqahwm2dbxmisw7j7qs1lqrx9k3n"; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 05961bce89cfc..dde0806add4a2 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.1.8"; + version = "0.2.1"; src = fetchFromGitHub { owner = "cwida"; repo = "duckdb"; rev = "v${version}"; - sha256 = "15qn967q9v23l0sgb2jqb77z4qdkyn1zwdpj4b0rd9zk5h3fzj55"; + sha256 = "18l4qdzfm8k9ggn49r3h99cbcmmq01byzkxps3pvmq8q246hb55x"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix new file mode 100644 index 0000000000000..2d83b9bbfab8c --- /dev/null +++ b/pkgs/development/libraries/embree/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, ispc, tbb, glfw, + openimageio, libjpeg, libpng, libpthreadstubs, libX11 }: + +stdenv.mkDerivation rec { + pname = "embree"; + version = "3.11.0"; + + src = fetchFromGitHub { + owner = "embree"; + repo = "embree"; + rev = "v${version}"; + sha256 = "0v5gqi8jp09xxcbyyknji83412bq4l0w35b6hnrqxycgdrnf7hkr"; + }; + + postPatch = '' + # Fix duplicate /nix/store/.../nix/store/.../ paths + sed -i "s|SET(EMBREE_ROOT_DIR .*)|set(EMBREE_ROOT_DIR $out)|" \ + common/cmake/embree-config.cmake + sed -i "s|$""{EMBREE_ROOT_DIR}/||" common/cmake/embree-config.cmake + ''; + + cmakeFlags = [ + "-DEMBREE_TUTORIALS=OFF" + "-DEMBREE_RAY_MASK=ON" + ]; + + nativeBuildInputs = [ ispc pkgconfig cmake ]; + buildInputs = [ tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]; + + meta = with stdenv.lib; { + description = "High performance ray tracing kernels from Intel"; + homepage = "https://embree.github.io/"; + maintainers = with maintainers; [ hodapp gebner ]; + license = licenses.asl20; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix index 5e5741516508f..0133138b47849 100644 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ b/pkgs/development/libraries/java/dbus-java/default.nix @@ -1,5 +1,6 @@ -{stdenv, fetchurl, gettext, jdk, libmatthew_java}: +{stdenv, fetchurl, gettext, jdk8, libmatthew_java}: +let jdk = jdk8; in stdenv.mkDerivation { name = "dbus-java-2.7"; src = fetchurl { diff --git a/pkgs/development/libraries/libde265/default.nix b/pkgs/development/libraries/libde265/default.nix index c9f45280bdad7..7c136dd7805da 100644 --- a/pkgs/development/libraries/libde265/default.nix +++ b/pkgs/development/libraries/libde265/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { - version = "1.0.5"; + version = "1.0.6"; pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; repo = "libde265"; rev = "v${version}"; - sha256 = "1qisj8ryzbknam3hk81rq70fsd9mcpxm898bqygvbsmbwyvmz3pg"; + sha256 = "0ipccyavlgf7hfzx1g8bvzg62xq10vcxvwgq70r3z3j6mdvmrzjp"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix index 27a10507a58dd..55e89d876649f 100644 --- a/pkgs/development/libraries/libgumath/default.nix +++ b/pkgs/development/libraries/libgumath/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "libgumath"; - version = "unstable-2018-11-27"; + version = "unstable-2019-08-01"; src = fetchFromGitHub { - owner = "plures"; + owner = "xnd-project"; repo = "gumath"; - rev = "5a9d27883b40432246d6a93cd6133157267fd166"; - sha256 = "0w2qzp7anxd1wzkvv5r2pdkkpgrnqzgrq47lrvpqc1i1wqzcwf0w"; + rev = "360ed454105ac5615a7cb7d216ad25bc4181b876"; + sha256 = "1wprkxpmjrk369fpw8rbq51r7jvqkcndqs209y7p560cnagmsxc6"; }; buildInputs = [ libndtypes libxnd ]; diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index d147820cff1ce..fd527eb415b9e 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libheif"; - version = "1.7.0"; + version = "1.8.0"; outputs = [ "bin" "out" "dev" "man" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "strukturag"; repo = "libheif"; rev = "v${version}"; - sha256 = "0alri5h486ck9b5z6wwrmlpzydhz58l223z3zxkizqrzxlllhr6p"; + sha256 = "15az44qdqp2vncdfv1bzdl30977kvqxcb2bhx4x3q6vcxnm1xfgg"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index c4136428035cf..3c3ccf27884ff 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -7,6 +7,7 @@ , python , libusb1 , runtimeShell +, lib }: stdenv.mkDerivation rec { @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { python libxml2 libusb1 - ]; + ] ++ lib.optional python.isPy3k python.pkgs.setuptools; cmakeFlags = [ "-DUDEV_RULES_INSTALL_DIR=${placeholder "out"}/lib/udev/rules.d" diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix index ffb2f56d67e09..d27c1ba376d18 100644 --- a/pkgs/development/libraries/libndtypes/default.nix +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { pname = "libndtypes"; - version = "unstable-2018-11-27"; + version = "unstable-2019-08-01"; src = fetchFromGitHub { - owner = "plures"; + owner = "xnd-project"; repo = "ndtypes"; - rev = "4d810d0c4d54c81a7136f313f0ae6623853d574a"; - sha256 = "1kk1sa7f17ffh49jc1qlizlsj536fr3s4flb6x4rjyi81rp7psb9"; + rev = "3ce6607c96d8fe67b72cc0c97bf595620cdd274e"; + sha256 = "18303q0jfar1lmi4krp94plczb455zcgw772f9lb8xa5p0bkhx01"; }; # Override linker with cc (symlink to either gcc or clang) diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index e762ead19231e..7c71dc4388b80 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.4.1"; + version = "1.5"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "0m96zjj832l18rzg9l31ambm6rv9vnh2a1sfk8531da8m347z287"; + sha256 = "1a3qkzpkag1vqd2xl7b7f2b8kbg1y1g6gg5ydzb1ppyqw3zdjf9x"; }; nativeBuildInputs = [ pkgconfig meson ninja doxygen ]; diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix index 7313b2582bea2..1fac0d86d4c72 100644 --- a/pkgs/development/libraries/libxnd/default.nix +++ b/pkgs/development/libraries/libxnd/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "libxnd"; - version = "unstable-2018-11-27"; + version = "unstable-2019-08-01"; src = fetchFromGitHub { - owner = "plures"; + owner = "xnd-project"; repo = "xnd"; - rev = "8a9f3bd1d01d872828b40bc9dbd0bc0184524da3"; - sha256 = "10jh2kqvhpzwy50adayh9az7z2lm16yxy4flrh99alzzbqdyls44"; + rev = "6f305cd40d90b4f3fc2fe51ae144b433d186a6cc"; + sha256 = "1n31d64qwlc7m3qkzbafhp0dgrvgvkdx89ykj63kll7r1n3yk59y"; }; buildInputs = [ libndtypes ]; @@ -28,6 +28,14 @@ stdenv.mkDerivation { "--with-libs=${libndtypes}/lib" ]; + # other packages which depend on libxnd seem to expect overflow.h, but + # it doesn't seem to be included in the installed headers. for now this + # works, but the generic name of the header could produce problems + # with collisions down the line. + postInstall = '' + cp libxnd/overflow.h $out/include/overflow.h + ''; + doCheck = true; meta = { diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/development/libraries/libxsmm/default.nix index 25c85948608a1..394347277f6af 100644 --- a/pkgs/development/libraries/libxsmm/default.nix +++ b/pkgs/development/libraries/libxsmm/default.nix @@ -1,9 +1,11 @@ -{ stdenv, fetchFromGitHub, coreutils, gfortran7, gnused -, python27, utillinux, which, bash +{ stdenv, fetchFromGitHub, coreutils, gfortran, gnused +, python3, utillinux, which + +, enableStatic ? false }: let - version = "1.15"; + version = "1.16.1"; in stdenv.mkDerivation { pname = "libxsmm"; inherit version; @@ -11,31 +13,40 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "hfp"; repo = "libxsmm"; - rev = "refs/tags/${version}"; - sha256 = "1406qk7k2k4qfqy4psqk55iihsrx91w8kjgsa82jxj50nl9nw5nj"; + rev = version; + sha256 = "1c1qj6hcdfx11bvilnly92vgk1niisd2bjw1s8vfyi2f7ws1wnp0"; }; - buildInputs = [ + nativeBuildInputs = [ coreutils - gfortran7 + gfortran gnused - python27 + python3 utillinux which ]; + enableParallelBuilding = true; + + dontConfigure = true; + + makeFlags = let + static = if enableStatic then "1" else "0"; + in [ + "OMP=1" + "PREFIX=$(out)" + "STATIC=${static}" + ]; + prePatch = '' patchShebangs . ''; - makeFlags = [ "PREFIX=$(out)" ]; - meta = with stdenv.lib; { description = "Library targeting Intel Architecture for specialized dense and sparse matrix operations, and deep learning primitives"; license = licenses.bsd3; homepage = "https://github.com/hfp/libxsmm"; platforms = platforms.linux; maintainers = with stdenv.lib.maintainers; [ chessai ]; - inherit version; }; } diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 8334bf195f7b2..c0b2366ab7fc9 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,6 +1,9 @@ { stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, - pkgconfig, fontconfig, freetype, expat, freeimage, vtk }: + pkgconfig, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb, + OpenCL, Cocoa +}: +with stdenv.lib; stdenv.mkDerivation rec { pname = "opencascade-oce"; version = "0.18.3"; @@ -13,13 +16,21 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ninja pkgconfig ]; - buildInputs = [ libGL libGLU libXmu freetype fontconfig expat freeimage vtk ]; + buildInputs = [ + libGL libGLU libXmu freetype fontconfig expat freeimage vtk + gl2ps tbb + ] + ++ optionals stdenv.isDarwin [OpenCL Cocoa] + ; cmakeFlags = [ "-DOCE_INSTALL_PREFIX=${placeholder "out"}" "-DOCE_WITH_FREEIMAGE=ON" "-DOCE_WITH_VTK=ON" - ]; + "-DOCE_WITH_GL2PS=ON" + "-DOCE_MULTITHREAD_LIBRARY=TBB" + ] + ++ optionals stdenv.isDarwin ["-DOCE_OSX_USE_COCOA=ON" "-DOCE_WITH_OPENCL=ON"]; patches = [ # Use fontconfig instead of hardcoded directory list @@ -33,6 +44,10 @@ stdenv.mkDerivation rec { url = "https://github.com/tpaviot/oce/commit/3b44656e93270d782009b06ec4be84d2a13f8126.patch"; sha256 = "1ccakkcwy5g0184m23x0mnh22i0lk45xm8kgiv5z3pl7nh35dh8k"; }) + (fetchpatch { + url = "https://github.com/tpaviot/oce/commit/cf50d078cd5fac03a48fd204938bd240930a08dc.patch"; + sha256 = "1xv94hcvggmb1c8vqwic1aiw9jw1sxk8mqbaak9xs9ycfqdvgdyc"; + }) ]; postPatch = '' @@ -41,11 +56,11 @@ stdenv.mkDerivation rec { --replace FONTCONFIG_LIBRARIES FONTCONFIG_LINK_LIBRARIES ''; - meta = with stdenv.lib; { + meta = { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; homepage = "https://github.com/tpaviot/oce"; maintainers = [ maintainers.viric ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 3647516c8031f..4393b6314614d 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "sqlite"; version = "3.33.0"; - # NB! Make sure to update analyzer.nix src (in the same directory). + # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz"; sha256 = "05dvdfaxd552gj5p7k0i72sfam7lykaw1g2pfn52jnppqx42qshh"; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix new file mode 100644 index 0000000000000..3ac1f617862e7 --- /dev/null +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, unzip, sqlite, tcl, Foundation }: + +let + archiveVersion = import ./archive-version.nix stdenv.lib; + mkTool = { pname, makeTarget, description, homepage }: stdenv.mkDerivation rec { + inherit pname; + version = "3.33.0"; + + src = assert version == sqlite.version; fetchurl { + url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip"; + sha256 = "1f09srlrmcab1sf8j2d89s2kvknlbxk7mbsiwpndw9mall27dgwh"; + }; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ tcl ] ++ stdenv.lib.optional stdenv.isDarwin Foundation; + + makeFlags = [ makeTarget ]; + + installPhase = "install -Dt $out/bin ${makeTarget}"; + + meta = with stdenv.lib; { + inherit description homepage; + downloadPage = http://sqlite.org/download.html; + license = licenses.publicDomain; + maintainers = with maintainers; [ pesterhazy johnazoidberg ]; + platforms = platforms.unix; + }; + }; +in +{ + sqldiff = mkTool { + pname = "sqldiff"; + makeTarget = "sqldiff"; + description = "A tool that displays the differences between SQLite databases"; + homepage = "https://www.sqlite.org/sqldiff.html"; + }; + sqlite-analyzer = mkTool { + pname = "sqlite-analyzer"; + makeTarget = "sqlite3_analyzer"; + description = "A tool that shows statistics about SQLite databases"; + homepage = "https://www.sqlite.org/sqlanalyze.html"; + }; +} diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index 21c186a673271..f191a97643786 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, blas +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, lapack , Accelerate, CoreGraphics, CoreVideo }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ boost blas ] + buildInputs = [ boost lapack ] ++ stdenv.lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ]; enableParallelBuilding = true; @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A vector and matrix math library implemented using C++ templates"; - longDescription = ''vmmlib is a vector and matrix math library implemented - using C++ templates. Its basic functionality includes a vector - and a matrix class, with additional functionality for the + longDescription = ''vmmlib is a vector and matrix math library implemented + using C++ templates. Its basic functionality includes a vector + and a matrix class, with additional functionality for the often-used 3d and 4d vectors and 3x3 and 4x4 matrices. - More advanced functionality include solvers, frustum + More advanced functionality include solvers, frustum computations and frustum culling classes, and spatial data structures''; license = licenses.bsd2; @@ -43,4 +43,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } - diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 71b9bd7741199..be1b58acd79e5 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -170,6 +170,32 @@ let meta.broken = since "10"; }; + vega-cli = super.vega-cli.override { + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ + super.node-pre-gyp + pixman + cairo + pango + libjpeg + ]; + }; + + vega-lite = super.vega-lite.override { + # npx tries to install vega from scratch at vegalite runtime if it + # can't find it. We thus replace it with a direct call to the nix + # derivation. This might not be necessary anymore in future vl + # versions: https://github.com/vega/vega-lite/issues/6863. + postInstall = '' + substituteInPlace $out/lib/node_modules/vega-lite/bin/vl2pdf \ + --replace "npx -p vega vg2pdf" "${self.vega-cli}/bin/vg2pdf" + substituteInPlace $out/lib/node_modules/vega-lite/bin/vl2svg \ + --replace "npx -p vega vg2svg" "${self.vega-cli}/bin/vg2svg" + substituteInPlace $out/lib/node_modules/vega-lite/bin/vl2png \ + --replace "npx -p vega vg2png" "${self.vega-cli}/bin/vg2png" + ''; + }; + webtorrent-cli = super.webtorrent-cli.override { buildInputs = [ self.node-gyp-build ]; }; @@ -181,6 +207,8 @@ let # https://sharp.pixelplumbing.com/install vips + libsecret + self.node-gyp-build self.node-pre-gyp ]; }; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 8b1bf76561b85..6a4affb915f8b 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -139,6 +139,7 @@ , "ocaml-language-server" , "parcel-bundler" , "parsoid" +, "patch-package" , "peerflix" , "peerflix-server" , "pnpm" @@ -198,6 +199,8 @@ , "typescript-language-server" , "uglify-js" , "ungit" +, "vega-cli" +, "vega-lite" , "vim-language-server" , "vscode-css-languageserver-bin" , "vscode-html-languageserver-bin" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 6b62485db050a..201deab6607f5 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "VHRggJbRY8vHIADWVwbq9cZux0L9LdmlN31XA3daVAI4gMkKdQEocxB7KqGDt6SfIJ3NYi/qh1nRJGooYmTBiA=="; }; }; - "@angular-devkit/architect-0.1001.1" = { + "@angular-devkit/architect-0.1001.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1001.1"; + version = "0.1001.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1001.1.tgz"; - sha512 = "2jRO7L/k9gNxHVJxPoUMVvtf/KzsSXNT7akbAbb8CkBJxjx3NC3Y9NssPD9E78kyiXogO6IvkwyalBGrWvOPBQ=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1001.2.tgz"; + sha512 = "05o12amjZ8NNIFehKm/lFYf12xvCclC7V5tGl/9+V7g/3pQqakwAjCysgb9T+ETffhmKhMnE8XdAJZqF7YrDcw=="; }; }; "@angular-devkit/core-10.0.7" = { @@ -67,13 +67,13 @@ let sha512 = "pXaZgsQ8LHpRx4QGAUYDE8GwBQLAtoqPh6oUCwRJwBExm5rl13OGPTBWewHiq0ysV/SnFXvOjxwAaHQvC1AgZw=="; }; }; - "@angular-devkit/core-10.1.1" = { + "@angular-devkit/core-10.1.2" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.1.1.tgz"; - sha512 = "0ZmknL5I177JO+iOz2gDSqHtPK3zGGwyz4ix9IIu172eFRX53sdbl1vDiMikovyvZWx5fXqU3Vazf7CUeGA28w=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.1.2.tgz"; + sha512 = "LMxesiCuXRe3UzPdRouXsC1W73/q6rVtACVoD5GdzmmnZ7cRh7oiwonqT0lEXIKQikMsZUasUOXHD2HoKV6BoA=="; }; }; "@angular-devkit/core-9.1.12" = { @@ -94,13 +94,13 @@ let sha512 = "eyyYPgpjtr3h7WbnNbkDubJ/p+8TgKU6abWd+NmBfTvyeHrpVFUYZabNRcdXwUDSVzfTQKdmLynIkESj/KROrg=="; }; }; - "@angular-devkit/schematics-10.1.1" = { + "@angular-devkit/schematics-10.1.2" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.1.1.tgz"; - sha512 = "4UrBbDkuzGmBN1YDG3+GBJ21C+X29vxO0k2EDGrFFjQROsDeogeyWJoUP789v4JCCz9DHF2TRmdhQiEBctZXMg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.1.2.tgz"; + sha512 = "gS5yP8ntw3/v9zBK9kBsp5r4gYlp8cLvJ3oWLZmSvdzzbm/QznPnRKqNm72AptKrlxRFX0xyrJ7vjtLWcssqxA=="; }; }; "@angular-devkit/schematics-9.1.12" = { @@ -121,40 +121,40 @@ let sha512 = "5zXO0WfyRySZudv2/EEC/UVfG75y7TGrdMfVZNc1WP0SB54psA0U3Z3jT+6Y9VjdjmXdxjVfybhuOzZ4I1fs0Q=="; }; }; - "@antora/asciidoc-loader-2.3.3" = { + "@antora/asciidoc-loader-2.3.4" = { name = "_at_antora_slash_asciidoc-loader"; packageName = "@antora/asciidoc-loader"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.3.3.tgz"; - sha512 = "4dPwCnpKUrME8PZLImOD3BBcyxpaA9tAtySPKACDJPkXc24GcfjI59QbSc+shG1fKptOGaDk68O2ZMu/Gpmlhw=="; + url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.3.4.tgz"; + sha512 = "IQ0d/hnOCGZXzTYUwKAw2BlyRMI4Kg/zu7XejQ6ERIncjuUUv/+PhlzVxoJNT0r9uasJFHDlZ7l3X53Hn+MUuQ=="; }; }; - "@antora/content-aggregator-2.3.3" = { + "@antora/content-aggregator-2.3.4" = { name = "_at_antora_slash_content-aggregator"; packageName = "@antora/content-aggregator"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.3.3.tgz"; - sha512 = "ehr0VmPltRCmKuSIT5idSnI7S2sn/q9UHBdB85GsvxOqgfM08lnkZrxbdiVqmg+06rLi8qUUCLB3dI4RZ8+xvw=="; + url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.3.4.tgz"; + sha512 = "ZwlGm/t90PUnGVo+pir71O+wC+gyXnVuhoAed+9bBLjsiGI7EGUzwUEXSZqHRSihPx5XLFj6pZinoCGX+uabcw=="; }; }; - "@antora/content-classifier-2.3.3" = { + "@antora/content-classifier-2.3.4" = { name = "_at_antora_slash_content-classifier"; packageName = "@antora/content-classifier"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.3.3.tgz"; - sha512 = "VLnOIuL0uRasQsXJ8m2vjpAFdEkpWfs1L32OuVupQ1SwjpUAvJz46W3pVg9qxxEWRRjtidCvcc3KY0LI6X0Jvw=="; + url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.3.4.tgz"; + sha512 = "DR4I6dLSZEFOS3T0F/hYwLf3AGY2Rb3e9j8V8ygEFzdP8OySAAZWyTjjJPF4pJZqjWtqD7s7S1f5/cCI83977Q=="; }; }; - "@antora/document-converter-2.3.3" = { + "@antora/document-converter-2.3.4" = { name = "_at_antora_slash_document-converter"; packageName = "@antora/document-converter"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.3.3.tgz"; - sha512 = "mGdDHRxYPts3QiT/thYVoQz1QgFXN6ZFU2jgjX0VmCzcIwKGK0TOgzbp+1A3V0o92VAISEmrjC812orbtHeKqA=="; + url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.3.4.tgz"; + sha512 = "Fo2SKdX3BlNrvfQEBOi2II+YmYzdEqKQ5+lO2pzxJuNBfqN0kJJYYk30jFPR27h6QuU43U/XZgufyDt+FjfdZg=="; }; }; "@antora/expand-path-helper-1.0.0" = { @@ -166,67 +166,67 @@ let sha512 = "hg3y6M3OvRTb7jtLAnwwloYDxafbyKYttcf16kGCXvP7Wqosh7c+Ag+ltaZ7VSebpzpphO/umb/BXdpU7rxapw=="; }; }; - "@antora/navigation-builder-2.3.3" = { + "@antora/navigation-builder-2.3.4" = { name = "_at_antora_slash_navigation-builder"; packageName = "@antora/navigation-builder"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.3.3.tgz"; - sha512 = "dx8PPFPvRBF+KInDXZU8k5dJ3sIVh1VvfsZhPUI27d5HMi+FRa0le8PK0OK5Hms4ixY/c1lXGcCAPFt0aH4Lxw=="; + url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.3.4.tgz"; + sha512 = "55I7p9tNTernQ/YR1+mp6RRXMV5EcU8q20Tdodt3mazdm3ObTe9E9XVAvUDFmDzRA27D0eb06jVRwLoth1gHYA=="; }; }; - "@antora/page-composer-2.3.3" = { + "@antora/page-composer-2.3.4" = { name = "_at_antora_slash_page-composer"; packageName = "@antora/page-composer"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.3.3.tgz"; - sha512 = "yp1bHj5twD8TbBn8MHwe7488EB+xVmbyFJBvV2GLMyiWN7DnlCaW/AaCiw05vsU4mDAd+MQ8P+KeNhDRZnlU2w=="; + url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.3.4.tgz"; + sha512 = "xY0O9X87DzcoP6k/5Jx55ysy0iQIhgav3q1JbOQK/FoYQYHbiQgmVWOjJdqh5nZw57ih3yE20JROPuYqOYuUZA=="; }; }; - "@antora/playbook-builder-2.3.3" = { + "@antora/playbook-builder-2.3.4" = { name = "_at_antora_slash_playbook-builder"; packageName = "@antora/playbook-builder"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.3.3.tgz"; - sha512 = "X9S38WgX2diZISNF4QKdF4ZfdND4ySsMlI26Iz4iybxf7xNlUJE1lAk9RM57Ooq543lEUNSnYHpECb1tog2BNw=="; + url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.3.4.tgz"; + sha512 = "iPjBndcoZhWqpN608WOkXKUUD94b3JX38igebshiT5/NRINJbeEclpdEX/gPv8D1Z1JcrSVGURZQO1uML76dkg=="; }; }; - "@antora/redirect-producer-2.3.3" = { + "@antora/redirect-producer-2.3.4" = { name = "_at_antora_slash_redirect-producer"; packageName = "@antora/redirect-producer"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.3.3.tgz"; - sha512 = "69QtpB9wPVsg7/ykJq8zYUrHywSOtfgJEizxK+GmWharjZyrMReNB7IX1pg7Dk8qI6CGB0OOkhIYC41nGmuhmg=="; + url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.3.4.tgz"; + sha512 = "148amiLc+1Pod6kluAOBke8OATFWFUW3LZdTPFVfqX1lJolCp5ciOnGciy52sIIysSyVkQUjotEUhqGO9Af1EQ=="; }; }; - "@antora/site-mapper-2.3.3" = { + "@antora/site-mapper-2.3.4" = { name = "_at_antora_slash_site-mapper"; packageName = "@antora/site-mapper"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.3.3.tgz"; - sha512 = "ERMGWl6s9B42crML7Tt4alPdJ/diSE6zQUSIMbbK7biI1EzjwxUCgKQ5lRJllUuGAdcXuYWQLGrpj/CWJzUXXA=="; + url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.3.4.tgz"; + sha512 = "GVghn6ausIWZlUfbEEdDD4YB7M1mWJAUMokyha9sE5w0gyYoWwukKWQiwCwk/JhvnwXunMLhEUm6y2nrHEmlLw=="; }; }; - "@antora/site-publisher-2.3.3" = { + "@antora/site-publisher-2.3.4" = { name = "_at_antora_slash_site-publisher"; packageName = "@antora/site-publisher"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.3.3.tgz"; - sha512 = "LAavxXd3wmH0hWqNkKMgQuj/fjE08BTO6zYR51KLBO798h0f7H0OgyBI+p8c7l/QANpAfjaWyBpbR1zOxnLCMQ=="; + url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.3.4.tgz"; + sha512 = "7xI/5OdjKq5tkdGzE0ABkl/QpIcgtnof+rnIWZweQKeQtA3LWutvEHtdIeXLQt0oNZmE/kf45FwC2XCg9/ptDg=="; }; }; - "@antora/ui-loader-2.3.3" = { + "@antora/ui-loader-2.3.4" = { name = "_at_antora_slash_ui-loader"; packageName = "@antora/ui-loader"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.3.3.tgz"; - sha512 = "bQVb6PE34iDmZj6wZZzYm3rLjguxoSqHZj4QReVQsOle/LdIwl48hV9Iz/Pivy9NtVCui9LL/lmSQzMt0G0jkw=="; + url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.3.4.tgz"; + sha512 = "eorTmZW7zc6ZHgGLt3Vrq7mzPuobPeJnyfli50/m/DIQ91slkqjPKUYGcq4paPEz6IWoa7LT2ZwtwA5KzMyTPg=="; }; }; "@apollo/federation-0.20.0" = { @@ -1345,22 +1345,22 @@ let sha512 = "bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q=="; }; }; - "@bugsnag/browser-7.3.4" = { + "@bugsnag/browser-7.3.5" = { name = "_at_bugsnag_slash_browser"; packageName = "@bugsnag/browser"; - version = "7.3.4"; + version = "7.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.3.4.tgz"; - sha512 = "2Og0IxymqJV5oeOuVHs/EJ0xR0V84GLcd6nZDHYSAcVU93wyb8722qfcIVx+CQRzYzoeeMmOb4n3xuuu+Svx+A=="; + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.3.5.tgz"; + sha512 = "Zs54UH7rXJTQbcuKDr6a4Qn2SDHr7cq7XLd5EHuLCJ6OMBktBlM8vZSf1sOiCBE2EE2g/kC2rk6VJktsRIaUEA=="; }; }; - "@bugsnag/core-7.3.4" = { + "@bugsnag/core-7.3.5" = { name = "_at_bugsnag_slash_core"; packageName = "@bugsnag/core"; - version = "7.3.4"; + version = "7.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.3.4.tgz"; - sha512 = "eEm4oMw77oOvBf8lHEhWbMYrQJPc9CncVrnVmgZoWYBMeQQQ9sTMKBPEmaO1RJwyWUv/TQc5bPCpDGlGarA3qg=="; + url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.3.5.tgz"; + sha512 = "7zKFLcA6m9aaQ1p1AQx2iRaT3gE/MJqy0vGa/RhlKNdgMdMKYRGECWxJE66firvJT5ZwL7Bu11IkK6sLWHCBaw=="; }; }; "@bugsnag/cuid-3.0.0" = { @@ -1372,22 +1372,22 @@ let sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; }; }; - "@bugsnag/js-7.3.4" = { + "@bugsnag/js-7.3.5" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.3.4"; + version = "7.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.3.4.tgz"; - sha512 = "00jqmlvDASwCV8g0ynfWkPobSacy78yysSWhSxrwZee0C2/ewzMUjWuaRg/iwCsoTV44O09est0qWgvmK4WArA=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.3.5.tgz"; + sha512 = "5KCeFEM7ntww2UbxbgW94TEwLHKzVLepDd8TNZeae2rdInt+fTc4o9oS0QxgubdLZHdLo9LNt8GTghl6F/9NwQ=="; }; }; - "@bugsnag/node-7.3.4" = { + "@bugsnag/node-7.3.5" = { name = "_at_bugsnag_slash_node"; packageName = "@bugsnag/node"; - version = "7.3.4"; + version = "7.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.3.4.tgz"; - sha512 = "G/yL7FGXnkDRDxBR0aEhDX8iZoiGIRGX4dc5CHmpKrS0fbhszIS7ApCT4p5TnXMvZadJTYqTW5ZST2gl0khbNQ=="; + url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.3.5.tgz"; + sha512 = "eN06NgphKYikBq/AXpiLO9tNx1H7cz8C78oQnR5fj2POulj+Zm9njr9dM6DEzGIvBDt952SwwcOA73jAiOmztQ=="; }; }; "@bugsnag/safe-json-stringify-6.0.0" = { @@ -1399,13 +1399,13 @@ let sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; }; }; - "@chemzqm/neovim-5.1.9" = { + "@chemzqm/neovim-5.2.6" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; - version = "5.1.9"; + version = "5.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.1.9.tgz"; - sha512 = "lV60tnl2jcJZj3Hb+IDg6uz2zsjsB2hIGAiaW5a452SlVeLmuUoDsy2WaqRbFqcIHZKG5GTP3ttnOlB+ltHWhg=="; + url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.2.6.tgz"; + sha512 = "9R4k2fvsX79dsNjxEjJaAlhdAZKx/DBGPHOXR3TVwJhX0TFPi9fvmHqJ8YFkAOweAVTXaiOdHv/LMerSBsA5Pw=="; }; }; "@cliqz-oss/firefox-client-0.3.1" = { @@ -1633,67 +1633,76 @@ let sha512 = "W98NvvOe/Med3o66xTO03pd7a2omZebH79PV64gSE+ceDdU8uxQhFTa7ISiD1kseyqyOrMyW5/MNdsGEU02i3Q=="; }; }; - "@fluentui/date-time-utilities-7.8.0" = { + "@fluentui/date-time-utilities-7.8.1" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "7.8.0"; + version = "7.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.8.0.tgz"; - sha512 = "qzlTp3t+PghebJsLK9JwZr91qBRZ/fOml8TQCIjdtsEn4mH6/ciCwir7Fj8iOEkwwTC0iKsEr1jfsITtJKWSmA=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.8.1.tgz"; + sha512 = "2FsR7scZ6yS9h7MEUAunpLLYpHp4z7+DVgGlIBlNeL7YD5Vl0msj4pn7zRd1pcGfvoQfkWz3+ju3rBBl4LV4wQ=="; }; }; - "@fluentui/keyboard-key-0.2.11" = { + "@fluentui/dom-utilities-1.1.1" = { + name = "_at_fluentui_slash_dom-utilities"; + packageName = "@fluentui/dom-utilities"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-1.1.1.tgz"; + sha512 = "w40gi8fzCpwa7U8cONiuu8rszPStkVOL/weDf5pCbYEb1gdaV7MDPSNkgM6IV0Kz+k017noDgK9Fv4ru1Dwz1g=="; + }; + }; + "@fluentui/keyboard-key-0.2.12" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; - version = "0.2.11"; + version = "0.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.11.tgz"; - sha512 = "4iG5vNlRD3PrLaMfDTimHNOP1x6V3Dad0fXOwtvBBMsfdySPE9zlY+G+0aqCFcgjymOriFOk0ANZVBpK7XrnTg=="; + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.12.tgz"; + sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; }; }; - "@fluentui/react-7.137.1" = { + "@fluentui/react-7.138.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.137.1"; + version = "7.138.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.137.1.tgz"; - sha512 = "u9qlBobDBjqwOK3vN7N7NoS53RuPXvcpVMOaK5oPRBMdCTsEDcK9pZj/OrKDSGVKmnPRGpoAdNAgsx34QaOfyQ=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.138.0.tgz"; + sha512 = "fekFIGSMqzSUbiqwm1GvYZ+BvmBPHwP0sUcoNct92WCTrfcwnHhX7q770RbcRGGG7K9OuasbGafP3auFHSz7FQ=="; }; }; - "@fluentui/react-focus-7.16.0" = { + "@fluentui/react-focus-7.16.5" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.0.tgz"; - sha512 = "TwB4Av7ID70ejisDIGkCZGKOxlquSazr6W+9Jv1JQAvsBLuj5XOspFJH4/Igjniw1LeO9QmAvFZeh/XRShiObw=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.5.tgz"; + sha512 = "FlRqYSzkptXuKvsIiI9m1tf7g5pRcbu9S9rK6c8pHax/kDRsBuDRW2OajxjVYR36B6IyAgYjylWdk6zBJI5oSQ=="; }; }; - "@fluentui/react-icons-0.3.0" = { + "@fluentui/react-icons-0.3.4" = { name = "_at_fluentui_slash_react-icons"; packageName = "@fluentui/react-icons"; - version = "0.3.0"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-icons/-/react-icons-0.3.0.tgz"; - sha512 = "QDrIhLUpkxM5q5bFE4pkweJJsfaNswdfDoc+X6cmr22Dii+anDFTpOcePEJiTtILxdlEmH0968OcZ4BGZF/joQ=="; + url = "https://registry.npmjs.org/@fluentui/react-icons/-/react-icons-0.3.4.tgz"; + sha512 = "/6xyGL7EQVCn9TP1eV+VjKS0HuC7WGZHs0t604E40LEE1HCIbXx7Jm1KDlMqP36n1W8XVDgyEZlffTmEOVGRkg=="; }; }; - "@fluentui/react-window-provider-0.3.0" = { + "@fluentui/react-window-provider-0.3.3" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; - version = "0.3.0"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-0.3.0.tgz"; - sha512 = "zHeH1PAmoFB3OkgU8f51E3oGHrL/CjuvdPBlb1SGpByUGNihAgH/CwvJohV9z0yPDkq+chfNUmxWA/oDVpbh6Q=="; + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-0.3.3.tgz"; + sha512 = "MVPf2hqOQ17LAZsuvGcr3oOHksAskUm+fCYdXFhbVoAgsCDVTIuH6i8XgHFd6YjBtzjZmI4+k/3NTQfDqBX8EQ=="; }; }; - "@fluentui/theme-0.2.0" = { + "@fluentui/theme-0.3.2" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "0.2.0"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-0.2.0.tgz"; - sha512 = "L5OwqymTdxTVwBa3ifkQLF1A3YU6WMkMTk6PFIMfOonjt8LJ3yMMqZgz+KQR3sF/tzgy4wzW4oBmrxtTfJS2EQ=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-0.3.2.tgz"; + sha512 = "Yt4VK2NKTc+Sao0+ZguXiQ0ZpN74h+7c+7YAyxaao2R/nwSHSnmH42VVlzBN+aL5kYDrbQ4P9Z8zPIwKEZ1u3A=="; }; }; "@graphql-cli/common-4.0.0" = { @@ -2038,6 +2047,24 @@ let sha512 = "44DWNv5gDR9EwrCTVQ4ZC99yPqVS0VCWrYIBl45qNR8XQy+4lbl0IQG8kBDf6NHwj4Ib4c2z1Fq1IUJOCbkZcw=="; }; }; + "@kwsites/file-exists-1.1.1" = { + name = "_at_kwsites_slash_file-exists"; + packageName = "@kwsites/file-exists"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz"; + sha512 = "m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw=="; + }; + }; + "@kwsites/promise-deferred-1.1.1" = { + name = "_at_kwsites_slash_promise-deferred"; + packageName = "@kwsites/promise-deferred"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz"; + sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; + }; + }; "@lerna/add-3.21.0" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; @@ -2569,13 +2596,13 @@ let sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A=="; }; }; - "@microsoft/load-themed-styles-1.10.90" = { + "@microsoft/load-themed-styles-1.10.93" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.90"; + version = "1.10.93"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.90.tgz"; - sha512 = "nJaQ6Yij68+GeaSt5ZgK70l5dn2aNGlc9EeES2B054anZTmmBhfaGpciIoSyPZrOg6PSAJjGWTXwd1ovMKOk1w=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.93.tgz"; + sha512 = "iziiQyDJmyP8QE33hYjuVsj18RvtzRMdON1QLDkJSrs9xisXWgEjK8U12UsEkBYpYXzxPxqq5+X+fK8Vs6g8vQ=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -2614,22 +2641,22 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-3.3.5" = { + "@netlify/build-4.0.4" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "3.3.5"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-3.3.5.tgz"; - sha512 = "QhPsiexwv2pKJTCvxiOKYaR5LmQS1H9hlF+8PzZBqk/rUUQAt9y6L6gQQJ1hnXEdsFIQGUqBG0aPolKgWQ3H7A=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-4.0.4.tgz"; + sha512 = "TXVFLp2z96Dl5MfaB0LgTIlD+9IThnjAsYsRrMJZXugOBgsIQzJr/uJql4ISKcK3b33T46amYT6+ULB6ZVJeLw=="; }; }; - "@netlify/cache-utils-1.0.2" = { + "@netlify/cache-utils-1.0.3" = { name = "_at_netlify_slash_cache-utils"; packageName = "@netlify/cache-utils"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.2.tgz"; - sha512 = "5eB8PpX4UaJsgVWwV+TSuGyzi/rysCqTSZzVVJVDSVr0sQa574N6LmLWuYl0WJluSTWeYtUUlATLeP838FaZfQ=="; + url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.3.tgz"; + sha512 = "M7hr8JDirjF9o+7JbHy0T59hfhQL7t9ywTpQ4h625jnJO7BaW+w0Y2CrH0M3QOfdukdof7rkUM2eyR8G0ReSZw=="; }; }; "@netlify/config-0.11.11" = { @@ -2641,31 +2668,31 @@ let sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw=="; }; }; - "@netlify/config-2.1.3" = { + "@netlify/config-2.1.5" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "2.1.3"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-2.1.3.tgz"; - sha512 = "rasNRIFI/U6j293k46capM+b9yc+NT/wfnqtSjd+WGsXuj6O4iMXuN5gpNteKg5RYGFP4mAkP4BjM+//OBFtvg=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-2.1.5.tgz"; + sha512 = "bsREmA1xLdThEZZwTcDZuTgu+eUO6bQJ/xLGmrCcerUn90lY7zh/P5w+1p5Kx0ebGeRQxQAmm1L9vQs2wUPcLg=="; }; }; - "@netlify/functions-utils-1.2.8" = { + "@netlify/functions-utils-1.2.9" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.2.8.tgz"; - sha512 = "Pi0IJ4REgr7AWu6dbOjlTMHB3v5s5ZXQboyCrgf9eYe7lVZRKtNrMjYtk3XMGAyL0MFmJFGeO8vIbp5ToQppsQ=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.2.9.tgz"; + sha512 = "1iMgfIMDy38ip7hAZd644BJ7he641xeGyG7MkPZtuxESfYfS6IrWiPNMu1NcVsNytXFLIFVg4m8LD6IBSiz1EQ=="; }; }; - "@netlify/git-utils-1.0.1" = { + "@netlify/git-utils-1.0.2" = { name = "_at_netlify_slash_git-utils"; packageName = "@netlify/git-utils"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.1.tgz"; - sha512 = "HiKpGyEHOW5ajkU/sQ8mSRIZvznC8GK1AAZWIeBmVRwZIzTykgmZM+HVjPUhfeFH+RK5bWQB4vg7dod2UttI8A=="; + url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.2.tgz"; + sha512 = "rqaCUHlJFYwvcCL8l+wp/YMhGkuXo2ceEf9fpHCN8GFOlU3kSu0NLRlKFohIFk1pdrymG1D3M7Pt+s62EKLjwA=="; }; }; "@netlify/open-api-0.16.0" = { @@ -2677,13 +2704,22 @@ let sha512 = "o3QI9hAe6lspQysWrB8CygMO4h+7B4qtPDkacitZ4VPBR26rX2TASq0/x1TNa4TnFG2lNgzkuBWhtXAmd/9tdw=="; }; }; - "@netlify/run-utils-1.0.0" = { + "@netlify/plugin-edge-handlers-1.1.0" = { + name = "_at_netlify_slash_plugin-edge-handlers"; + packageName = "@netlify/plugin-edge-handlers"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.1.0.tgz"; + sha512 = "JR7d1u48ne9+Y2bRGYmYvWDaGhkZccZuw12ba63q6EJTHMC+hMp8t+Le1G6Bds+SEEox4npt0VHyHfuWmCcMaA=="; + }; + }; + "@netlify/run-utils-1.0.1" = { name = "_at_netlify_slash_run-utils"; packageName = "@netlify/run-utils"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.0.tgz"; - sha512 = "TcdVJZ3J4iu+WYV9sLMBOr1jW2+XgLtIt1LfGYqsH+yqfkWoWavV27y5ttznM1BODFYQb9fMJG/xO2wAeXCzMw=="; + url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.1.tgz"; + sha512 = "fx0A9xVgFQXjZ/uZCa4XtlaO7mPgwhanVHwQAcBDGOwps8fhuaVITCcPy/kPv+igOimvqWzOD3x/F0OrsXGpBw=="; }; }; "@netlify/zip-it-and-ship-it-1.3.12" = { @@ -3217,6 +3253,15 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; + "@rollup/plugin-babel-5.2.1" = { + name = "_at_rollup_slash_plugin-babel"; + packageName = "@rollup/plugin-babel"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.2.1.tgz"; + sha512 = "Jd7oqFR2dzZJ3NWANDyBjwTtX/lYbZpVcmkHrfQcpvawHs9E4c0nYk5U2mfZ6I/DZcIvy506KZJi54XK/jxH7A=="; + }; + }; "@rollup/plugin-commonjs-13.0.2" = { name = "_at_rollup_slash_plugin-commonjs"; packageName = "@rollup/plugin-commonjs"; @@ -3226,6 +3271,24 @@ let sha512 = "9JXf2k8xqvMYfqmhgtB6eCgMN9fbxwF1XDF3mGKJc6pkAmt0jnsqurxQ0tC1akQKNSXCm7c3unQxa3zuxtZ7mQ=="; }; }; + "@rollup/plugin-commonjs-15.0.0" = { + name = "_at_rollup_slash_plugin-commonjs"; + packageName = "@rollup/plugin-commonjs"; + version = "15.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.0.0.tgz"; + sha512 = "8uAdikHqVyrT32w1zB9VhW6uGwGjhKgnDNP4pQJsjdnyF4FgCj6/bmv24c7v2CuKhq32CcyCwRzMPEElaKkn0w=="; + }; + }; + "@rollup/plugin-json-4.1.0" = { + name = "_at_rollup_slash_plugin-json"; + packageName = "@rollup/plugin-json"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz"; + sha512 = "yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw=="; + }; + }; "@rollup/plugin-node-resolve-8.4.0" = { name = "_at_rollup_slash_plugin-node-resolve"; packageName = "@rollup/plugin-node-resolve"; @@ -3235,6 +3298,15 @@ let sha512 = "LFqKdRLn0ShtQyf6SBYO69bGE1upV6wUhBX0vFOUnLAyzx5cwp8svA0eHUnu8+YU57XOkrMtfG63QOpQx25pHQ=="; }; }; + "@rollup/plugin-node-resolve-9.0.0" = { + name = "_at_rollup_slash_plugin-node-resolve"; + packageName = "@rollup/plugin-node-resolve"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-9.0.0.tgz"; + sha512 = "gPz+utFHLRrd41WMP13Jq5mqqzHL3OXrfj3/MkSyB6UBIcuNt9j60GCbarzMzdf1VHFpOxfQh/ez7wyadLMqkg=="; + }; + }; "@rollup/pluginutils-3.1.0" = { name = "_at_rollup_slash_pluginutils"; packageName = "@rollup/pluginutils"; @@ -3262,13 +3334,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-10.1.1" = { + "@schematics/angular-10.1.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.1.1.tgz"; - sha512 = "U+5CfLlMqgkfRWZpmA3yzr+Axj1D42k0+tkfuaBrJTJUf5j7+JyULONPvzUh4Pi1c4EZJt+RuCE+AxtUZO/hug=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.1.2.tgz"; + sha512 = "7BHgSdP4yC0IuoiPGWBGQrwE5ilBhIOGozjKSHx41Utac45YKyXpmjr1Jw+SvFilgsnPEjZwc7VKqgINmeLkqA=="; }; }; "@schematics/schematics-0.1000.7" = { @@ -3280,13 +3352,13 @@ let sha512 = "mucBf5EkhME9O0TvxPeiUTEuudRvEOSjhF/YFHEp/9NZB1JH9lXtBQ60IN6xtCLEbxJmAzhZSns9QPPrHaZRrw=="; }; }; - "@schematics/update-0.1001.1" = { + "@schematics/update-0.1001.2" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1001.1"; + version = "0.1001.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1001.1.tgz"; - sha512 = "71PyE0pTW2u3PPkNBdCXO0gH9pwTgZCfsHNNOWsIsslDDHYHGknJagN0JM/X1YAJ0nVZPgvMC0GSJ/xtIoCZmA=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1001.2.tgz"; + sha512 = "Z/P08k4FlbKNmxV5pe34yfKPLI2327CjBg26isO5qpR4nB1FVZkC39YXwFwJod3nU7DE6UMkKcA749k30k2KSg=="; }; }; "@serverless/cli-1.5.2" = { @@ -3307,13 +3379,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.1.2" = { + "@serverless/components-3.1.3" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.1.2.tgz"; - sha512 = "qkelIDlMMRRioY1iijRl7RA/ojoYZ/4Kh2EqcQRcQQzPz7yKICKpOuqA0Juq/ZW3zX2V18MXRvemJ/tNwPPZrQ=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.1.3.tgz"; + sha512 = "WVPM0lVwzzg1KuCGVWNnps/X4IyLdkFQ34XLLJq6PMtsOxeYs9GMg5j8C9TBrWN2s9eJjUpu2fq0KOt2L/s5yQ=="; }; }; "@serverless/core-1.1.2" = { @@ -3325,13 +3397,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-4.0.2" = { + "@serverless/enterprise-plugin-4.0.4" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "4.0.2"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.0.2.tgz"; - sha512 = "jad3tvY6N89Pm35cKjjG56usXIs+Txg9UBMCWAZ/b64hdJ2gXrAzKM3qrS/7CoRj0yI1cefxKKzj04AihDNimg=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.0.4.tgz"; + sha512 = "B+I1tZWWJN2Ziwp34FZ9umbu6cZ5Pv8lHA6iOtYzMqq6r22xF/9rwxY3fCdguo+Szd6t7RFb0zIW2RuBRgktVA=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -3361,6 +3433,15 @@ let sha512 = "vMCYRdDaqQjPDlny3+mVNy0lr1P6RJ7hVkR2w9Bk783ZB894hobtMrTm8V8OQPwOvlAypmLnQsLPXwRNM+AMsw=="; }; }; + "@serverless/platform-client-2.0.2" = { + name = "_at_serverless_slash_platform-client"; + packageName = "@serverless/platform-client"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-2.0.2.tgz"; + sha512 = "3guXwRmHOujBy6Lmf7THtnfJQcLRYzpTRpL1rCxLko7OtIWcOth3TvW2JtWNu6qubauA+5kpLB2rdCaPefZYbQ=="; + }; + }; "@serverless/platform-client-china-1.0.37" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; @@ -3397,13 +3478,13 @@ let sha512 = "aI/cpGVUhWbJUR8QDMtPue28EU4ViG/L4/XKuZDfAN2uNQv3NRjwEFIBi/cxyfQnMTYVtMLe9wDjuwzOT4ENzA=="; }; }; - "@serverless/utils-china-0.1.27" = { + "@serverless/utils-china-0.1.28" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "0.1.27"; + version = "0.1.28"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.27.tgz"; - sha512 = "ZQDTtmFBD2xl23YFFMVOTmqsgqtcxk9WKBGdixZ3ZY2MxAjrNJvBE0vPCRsYrQCs0I+TzdPDRIPSrOUJh7cpiw=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.28.tgz"; + sha512 = "nxMBES1wR+U1U8UWaWd7CwKmoY18SRHT6h39ux8YGXgxeRd9pqKB4/TTLX4hHYMsqHteXufpFZQIhl0aGf9oww=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -3964,6 +4045,15 @@ let sha512 = "4QQNE/b+digosu3mnj4E7aNQGKnlpzXa9JvQYPtexpO7v9gnDeqwc1DxF8vLJWLDCNoO6hH0EgO8K/7PtJl8wg=="; }; }; + "@types/clone-2.1.0" = { + name = "_at_types_slash_clone"; + packageName = "@types/clone"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/clone/-/clone-2.1.0.tgz"; + sha512 = "d/aS/lPOnUSruPhgNtT8jW39fHRVTLQy9sodysP1kkG8EdAtdZu1vt8NJaYA8w/6Z9j8izkAsx1A/yJhcYR1CA=="; + }; + }; "@types/color-name-1.1.1" = { name = "_at_types_slash_color-name"; packageName = "@types/color-name"; @@ -4117,6 +4207,15 @@ let sha512 = "mQjDxyOM1Cpocd+vm1kZBP7smwKZ4TNokFeds9LV7OZibmPJFEzY3+xZMrKfUdNT71lv8GoCPD6upKwHxubClw=="; }; }; + "@types/fast-json-stable-stringify-2.0.0" = { + name = "_at_types_slash_fast-json-stable-stringify"; + packageName = "@types/fast-json-stable-stringify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha512 = "mky/O83TXmGY39P1H9YbUpjV6l6voRYlufqfFCvel8l1phuy8HRjdWc1rrPuN53ITBJlbyMSV6z3niOySO5pgQ=="; + }; + }; "@types/fs-capacitor-2.0.0" = { name = "_at_types_slash_fs-capacitor"; packageName = "@types/fs-capacitor"; @@ -4459,13 +4558,13 @@ let sha512 = "1GJnq7RwuFPRicMHdT53vza5v39nep9OKIbozxNUpFXP04CydcdWrqpZQ+MlVdlLFCisWnnt09xughajjWpFsw=="; }; }; - "@types/node-10.17.32" = { + "@types/node-10.17.35" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.32"; + version = "10.17.35"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.32.tgz"; - sha512 = "EUq+cjH/3KCzQHikGnNbWAGe548IFLSm93Vl8xA7EuYEEATiyOVDyEVuGkowL7c9V69FF/RiZSAOCFPApMs/ig=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.35.tgz"; + sha512 = "gXx7jAWpMddu0f7a+L+txMplp3FnHl53OhQIF9puXKq3hDGY/GjH+MF04oWnV/adPSCrbtHumDCFwzq2VhltWA=="; }; }; "@types/node-12.7.12" = { @@ -4477,13 +4576,13 @@ let sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; }; }; - "@types/node-13.13.19" = { + "@types/node-13.13.21" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.19"; + version = "13.13.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.19.tgz"; - sha512 = "IVsULCpTdafcHhBDLYEPnV5l15xV0q065zvOHC1ZmzFYaBCMzku078eXnazoSG8907vZjRgEN/EQjku7GwwFyQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.21.tgz"; + sha512 = "tlFWakSzBITITJSxHV4hg4KvrhR/7h3xbJdSFbYJBVzKubrASbnnIFuSgolUh7qKGo/ZeJPKUfbZ0WS6Jp14DQ=="; }; }; "@types/node-14.0.26" = { @@ -4495,22 +4594,22 @@ let sha512 = "W+fpe5s91FBGE0pEa0lnqGLL4USgpLgs4nokw16SrBBco/gQxuua7KnArSEOd5iaMqbbSHV10vUDkJYJJqpXKA=="; }; }; - "@types/node-14.10.1" = { + "@types/node-14.11.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.10.1"; + version = "14.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.10.1.tgz"; - sha512 = "aYNbO+FZ/3KGeQCEkNhHFRIzBOUgc7QvcVNKXbfnhDkSfwUv91JsQQa10rDgKSTSLkXZ1UIyPe4FJJNVgw1xWQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz"; + sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-6.14.11" = { + "@types/node-6.14.12" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "6.14.11"; + version = "6.14.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-6.14.11.tgz"; - sha512 = "htzPk08CmbGFjgIWaJut1oW2roZAAQxxOhkhsehCVLE7Uocx9wkcHfIQYdBWO7KqbuRvYrdBQtl5h5Mz/GxehA=="; + url = "https://registry.npmjs.org/@types/node/-/node-6.14.12.tgz"; + sha512 = "7iPCCv/SOqeGvz3CcBBnhG+3vBMntO3SMVcyUHmrJq6Lzdbi4dtSxk3JkIUm+JDGnT26mtxlNQHmTKlvDnjFwg=="; }; }; "@types/node-fetch-2.5.7" = { @@ -4585,13 +4684,13 @@ let sha512 = "1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="; }; }; - "@types/qs-6.9.4" = { + "@types/qs-6.9.5" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.4"; + version = "6.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.4.tgz"; - sha512 = "+wYo+L6ZF6BMoEjtf8zB2esQsqdV6WsjRK/GP9WOgLPrq87PbNWgIxS76dS5uvl/QXtHGakZmwTznIfcPXcKlQ=="; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz"; + sha512 = "/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ=="; }; }; "@types/range-parser-1.2.3" = { @@ -4945,67 +5044,67 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@uifabric/foundation-7.9.0" = { + "@uifabric/foundation-7.9.5" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.9.0"; + version = "7.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.0.tgz"; - sha512 = "4gdPwx0HV59aWvPKIw6yIje60CYwJZmTJsdLRXqh8Np1tWp2EsbA8U/IHQL1V91rEN0DlQhASqCDFhfQoD1jUw=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.5.tgz"; + sha512 = "r4KjYJAjSRgBGqeJXGKogYgzJS55/zcxmU3Gsps0BCMP8SCn55KZ31KiMYmjxoNnJAlGnhIq+h5zUEVRhpHN/Q=="; }; }; - "@uifabric/icons-7.5.0" = { + "@uifabric/icons-7.5.5" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.5.0"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.0.tgz"; - sha512 = "RINA9VkajlCnlwEBbqiwLBaaGn38Bf9UvjOuwrrja4B9lclLeQzZuGrG/kp7CnDtIO+LC19OYl/7E3jW7yIihA=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.5.tgz"; + sha512 = "lErlirRm3D4Lv63oxa/JFx+JUyHRX/pqNoolLQKlPKqNauHFcrcEEDRuZdtfSOJtF/1a09ZvIyirij3XwZjNBw=="; }; }; - "@uifabric/merge-styles-7.18.0" = { + "@uifabric/merge-styles-7.19.1" = { name = "_at_uifabric_slash_merge-styles"; packageName = "@uifabric/merge-styles"; - version = "7.18.0"; + version = "7.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.18.0.tgz"; - sha512 = "805WIbN7lAJATXKxZjjRbIgN7raRMwWYWeDkJJ52PCPuCesOvbpdr0GkH8rC6GQ7EB0MB7YM2i6Fiye7SFewbw=="; + url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.19.1.tgz"; + sha512 = "yqUwmk62Kgu216QNPE9vOfS3h0kiSbTvoqM5QcZi+IzpqsBOlzZx3A9Er9UiDaqHRd5lsYF5pO/jeUULmBWF/A=="; }; }; - "@uifabric/react-hooks-7.13.0" = { + "@uifabric/react-hooks-7.13.4" = { name = "_at_uifabric_slash_react-hooks"; packageName = "@uifabric/react-hooks"; - version = "7.13.0"; + version = "7.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.0.tgz"; - sha512 = "A7K0YFHHr10hB/txsqpPX6PhNhHEv8U7JpY3O81oqlZwSsHroJklQdd897JkAYJUUR+gWe2kQyXkkcaMDdqXjg=="; + url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.4.tgz"; + sha512 = "hyL3eQqbS7DrZCpkF1QDrC0TX+dV+yZZr5UgT3wAZMtzEMBFVgaiPHdv0zHgUbiQv5ktbQoY7yQp7clfVN65DA=="; }; }; - "@uifabric/set-version-7.0.22" = { + "@uifabric/set-version-7.0.23" = { name = "_at_uifabric_slash_set-version"; packageName = "@uifabric/set-version"; - version = "7.0.22"; + version = "7.0.23"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.22.tgz"; - sha512 = "IG35UNJNxqI7NC2eYuobGTD+v4W0VHQcC3bYd5Na9EgoC9jVgguS8n6EXUtP/lC1vJEYEyPEZdVwhPxKw4F4Sw=="; + url = "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.23.tgz"; + sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA=="; }; }; - "@uifabric/styling-7.16.0" = { + "@uifabric/styling-7.16.5" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.0.tgz"; - sha512 = "yO404ws8Wl4fjBwG4T58TFJjeU/K+SpWJ4w+WeNMDlJcYe4zXaWn2lbOJtKtQiMl324RAEjFSOuNkXzPb0uOGQ=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.5.tgz"; + sha512 = "mJcPam0ivtGfC8NEUQgpJFs8uG4ZRY1ml1RY9rOY6py5pTEno15xaq11yfRxv3ACxkuK9D9qZM23x0q8sWsCdg=="; }; }; - "@uifabric/utilities-7.31.0" = { + "@uifabric/utilities-7.32.2" = { name = "_at_uifabric_slash_utilities"; packageName = "@uifabric/utilities"; - version = "7.31.0"; + version = "7.32.2"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.31.0.tgz"; - sha512 = "m4Yeyn4gyW7xS8LvOnCesokPModYS2YuE9GQmO++MDZ/vC5RRNlvlyktUZDuxCZ84cNCiXyTQ8nImBaPGnxHVQ=="; + url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.32.2.tgz"; + sha512 = "x47zJIjezkfed17EfNRTr9wP6hHR+i0pBbr3eQYetpcVsAXcbZsd+D6divwy+kQOsdLQ8TozWqoVk3ySe6RfSw=="; }; }; "@vue/cli-shared-utils-4.5.6" = { @@ -5044,76 +5143,76 @@ let sha512 = "4Lpf59lr0pycIzKdTlZsgubJxCHDkAqcc4I60Gp6rggueksuhz2q3rAp7kfxwCzaZlAXXsqy6hoeyj+3sukqDQ=="; }; }; - "@vue/compiler-core-3.0.0-rc.10" = { + "@vue/compiler-core-3.0.0" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.0.0-rc.10"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.0-rc.10.tgz"; - sha512 = "kQzHzRsM0NPAWHeqSTb2J4VsHhjRkGeLTsGzeMnW+sojgTnS3T94KacwvYgVS4qeZAKiDq0bMNZoJWrHVQ3T8g=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.0.tgz"; + sha512 = "XqPC7vdv4rFE77S71oCHmT1K4Ks3WE2Gi6Lr4B5wn0Idmp+NyQQBUHsCNieMDRiEpgtJrw+yOHslrsV0AfAsfQ=="; }; }; - "@vue/compiler-dom-3.0.0-rc.10" = { + "@vue/compiler-dom-3.0.0" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.0.0-rc.10"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.0-rc.10.tgz"; - sha512 = "pqIUf5leZm0P9379utrRSVBMxhV8XaqJTEFFp5etCtbEa/H5ALs29EjFMtMcm9sQaVkZlKLu86mgIacbYB9Q3w=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.0.tgz"; + sha512 = "ukDEGOP8P7lCPyStuM3F2iD5w2QPgUu2xwCW2XNeqPjFKIlR2xMsWjy4raI/cLjN6W16GtlMFaZdK8tLj5PRog=="; }; }; - "@vue/compiler-sfc-3.0.0-rc.10" = { + "@vue/compiler-sfc-3.0.0" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.0.0-rc.10"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.0-rc.10.tgz"; - sha512 = "VIJ+VXqeM7WoRNgD9uYSARVb6CYq+JS2NNHfeerfNc7Uk3pjYHRv1MwEicAvN6zWFm5GLC1ZYTVD+WFg3xGAkQ=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.0.tgz"; + sha512 = "1Bn4L5jNRm6tlb79YwqYUGGe+Yc9PRoRSJi67NJX6icdhf84+tRMtESbx1zCLL9QixQXu2+7aLkXHxvh4RpqAA=="; }; }; - "@vue/compiler-ssr-3.0.0-rc.10" = { + "@vue/compiler-ssr-3.0.0" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.0.0-rc.10"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.0-rc.10.tgz"; - sha512 = "JBPil8sO5j7puB8acX2CQMRXEYB/EP8PoEur7RcF/+aqATI7C4yqWcSLC5TRJpigj6xE6ku6sx8om+j7ZHvgBw=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.0.tgz"; + sha512 = "Er41F9ZFyKB3YnNbE6JSTIGCVWve3NAQimgDOk4uP42OnckxBYKGBTutDeFNeqUZBMu/9vRHYrxlGFC9Z5jBVQ=="; }; }; - "@vue/reactivity-3.0.0-rc.10" = { + "@vue/reactivity-3.0.0" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.0.0-rc.10"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.0-rc.10.tgz"; - sha512 = "mkUZfOJlbqGZx2cARmhCs5r2+xLJPL7VFNagmlA3Fd66ZXBc3ZvTQdYsY4VUbYJFe5ByIzqu9TZiAkzXY+JVaA=="; + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.0.tgz"; + sha512 = "mEGkztGQrAPZRhV7C6PorrpT3+NtuA4dY2QjMzzrW31noKhssWTajRZTwpLF39NBRrF5UU6cp9+1I0FfavMgEQ=="; }; }; - "@vue/runtime-core-3.0.0-rc.10" = { + "@vue/runtime-core-3.0.0" = { name = "_at_vue_slash_runtime-core"; packageName = "@vue/runtime-core"; - version = "3.0.0-rc.10"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.0-rc.10.tgz"; - sha512 = "VK/kq4gDDoqZ45CVwdbLLpikXLYLCt6YLhdgXX3fhf20gvPqrbEZv1ZNLruNnhhTpf9cLyU4tZ18DHeaUYPziw=="; + url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.0.tgz"; + sha512 = "3ABMLeA0ZbeVNLbGGLXr+pNUwqXILOqz8WCVGfDWwQb+jW114Cm8djOHVVDoqdvRETQvDf8yHSUmpKHZpQuTkA=="; }; }; - "@vue/runtime-dom-3.0.0-rc.10" = { + "@vue/runtime-dom-3.0.0" = { name = "_at_vue_slash_runtime-dom"; packageName = "@vue/runtime-dom"; - version = "3.0.0-rc.10"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.0-rc.10.tgz"; - sha512 = "bH4GuneHt3FQ+/21jba5orM/CO9N1cnT7J3wtrxopFJ4/4H5cvHXyG6v+ZVTu1d733Ij/6yMRA7xbtfi9a4zJw=="; + url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.0.tgz"; + sha512 = "f312n5w9gK6mVvkDSj6/Xnot1XjlKXzFBYybmoy6ahAVC8ExbQ+LOWti1IZM/adU8VMNdKaw7Q53Hxz3y5jX8g=="; }; }; - "@vue/shared-3.0.0-rc.10" = { + "@vue/shared-3.0.0" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.0.0-rc.10"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.0-rc.10.tgz"; - sha512 = "fI6gVhhgb3cAmEkY4oeVVA2hWZ2xvkgogHdBI5PL7gSvZnOB6XZ2eQGsYjC4W+7BegvEkoMBuZsFXVa4ZQ07XQ=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.0.tgz"; + sha512 = "4XWL/avABGxU2E2ZF1eZq3Tj7fvksCMssDZUHOykBIMmh5d+KcAnQMC5XHMhtnA0NAvktYsA2YpdsVwVmhWzvA=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -6997,6 +7096,15 @@ let sha512 = "B9IZjlGwaxF33UN4oPbfBkyA4V1SxNLeIhR1qY8sRXSsbdUkEHrrOvwlYFPx+8uQeCe9M+FG6KgO+imDmQ79CQ=="; }; }; + "archiver-5.0.2" = { + name = "archiver"; + packageName = "archiver"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/archiver/-/archiver-5.0.2.tgz"; + sha512 = "Tq3yV/T4wxBsD2Wign8W9VQKhaUxzzRmjEiSoOK0SLqPgDP/N1TKdYyBeIEu56T4I9iO4fKTTR0mN9NWkBA0sg=="; + }; + }; "archiver-utils-1.3.0" = { name = "archiver-utils"; packageName = "archiver-utils"; @@ -8104,13 +8212,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.751.0" = { + "aws-sdk-2.756.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.751.0"; + version = "2.756.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.751.0.tgz"; - sha512 = "0lo7YKTfjEwoP+2vK7F7WGNigvwFxqiM96PzBaseOpOelfhFHPKEJpk2Poa12JI89c8dGoc1PhTQ1TSTJK3ZqQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.756.0.tgz"; + sha512 = "Hk6DzcsXq1WRg+UVHDH56iQz31kDtg/NRqtJL1A0BrZ/PtNSLTHsQQllpcAi09UxLDMzBoDXymZ8kYg0Migq8w=="; }; }; "aws-sign2-0.6.0" = { @@ -9031,6 +9139,15 @@ let sha1 = "e24ebfa6b63cb0387c5fc174f86e5cc812ca7cc9"; }; }; + "binary-0.3.0" = { + name = "binary"; + packageName = "binary"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz"; + sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79"; + }; + }; "binary-extensions-1.13.1" = { name = "binary-extensions"; packageName = "binary-extensions"; @@ -9796,13 +9913,13 @@ let sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA=="; }; }; - "browserslist-4.14.2" = { + "browserslist-4.14.3" = { name = "browserslist"; packageName = "browserslist"; - version = "4.14.2"; + version = "4.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz"; - sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.3.tgz"; + sha512 = "GcZPC5+YqyPO4SFnz48/B0YaCwS47Q9iPChRGi6t7HhflKBcINzFrJvRfC+jp30sRMKxF+d4EHGs27Z0XP1NaQ=="; }; }; "bser-2.1.1" = { @@ -9985,6 +10102,15 @@ let sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="; }; }; + "buffer-indexof-polyfill-1.0.2" = { + name = "buffer-indexof-polyfill"; + packageName = "buffer-indexof-polyfill"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz"; + sha512 = "I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A=="; + }; + }; "buffer-queue-1.0.0" = { name = "buffer-queue"; packageName = "buffer-queue"; @@ -10552,13 +10678,22 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001129" = { + "caniuse-lite-1.0.30001131" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001129"; + version = "1.0.30001131"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001129.tgz"; - sha512 = "9945fTVKS810DZITpsAbuhQG7Lam0tEfVbZlsBaCFZaszepbryrArS05PWmJSBQ6mta+v9iz0pUIAbW1eBILIg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001131.tgz"; + sha512 = "4QYi6Mal4MMfQMSqGIRPGbKIbZygeN83QsWq1ixpUwvtfgAZot5BrCKzGygvZaV+CnELdTwD0S4cqUNozq7/Cw=="; + }; + }; + "canvas-2.6.1" = { + name = "canvas"; + packageName = "canvas"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/canvas/-/canvas-2.6.1.tgz"; + sha512 = "S98rKsPcuhfTcYbtF53UIJhcbgIAK533d1kJKMwsMwAIFgfd58MOyxRud3kktlzWiEkFliaJtvyZCBtud/XVEA=="; }; }; "capital-case-1.0.3" = { @@ -10696,6 +10831,15 @@ let sha1 = "11a05102d1c4c785b6d0415d336d5a3a1612913e"; }; }; + "chainsaw-0.1.0" = { + name = "chainsaw"; + packageName = "chainsaw"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz"; + sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98"; + }; + }; "chalk-0.4.0" = { name = "chalk"; packageName = "chalk"; @@ -11911,13 +12055,13 @@ let sha512 = "q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA=="; }; }; - "coc.nvim-0.0.77" = { + "coc.nvim-0.0.79" = { name = "coc.nvim"; packageName = "coc.nvim"; - version = "0.0.77"; + version = "0.0.79"; src = fetchurl { - url = "https://registry.npmjs.org/coc.nvim/-/coc.nvim-0.0.77.tgz"; - sha512 = "wwn3ca7iMKuH/a6NAV7HL95xkEK5DzrKJ1dWGKBs+HZHFLhzXVYhjA0RL8x8Xf62TBEQGhH1wlKtBxkluGd1oQ=="; + url = "https://registry.npmjs.org/coc.nvim/-/coc.nvim-0.0.79.tgz"; + sha512 = "tge3BeOtehBouqo8sdrjRuQxsAWuwUxWJN1pTttZ8HpV+fe2fxmBE9lqrzzOlRIysBvgsZr7D0FdNfrwRwpK8A=="; }; }; "code-error-fragment-0.0.230" = { @@ -12577,6 +12721,15 @@ let sha512 = "FyDqr8TKX5/X0qo+aVfaZ+PVmNJHJeckFBlq8jZGSJOgnynhfifoyl24qaqdUdDIBe0EVTHByN6NAkqYvE/2Xg=="; }; }; + "compress-commons-4.0.1" = { + name = "compress-commons"; + packageName = "compress-commons"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/compress-commons/-/compress-commons-4.0.1.tgz"; + sha512 = "xZm9o6iikekkI0GnXCmAl3LQGZj5TBDj0zLowsqi7tJtEa3FMGSEcHcqrSJIrOAk1UG/NBbDn/F1q+MG/p/EsA=="; + }; + }; "compressible-2.0.18" = { name = "compressible"; packageName = "compressible"; @@ -12829,13 +12982,13 @@ let sha1 = "5a25047bc76f73072667c8cb52c989888f494c63"; }; }; - "consolidate-0.15.1" = { + "consolidate-0.16.0" = { name = "consolidate"; packageName = "consolidate"; - version = "0.15.1"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz"; - sha512 = "DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw=="; + url = "https://registry.npmjs.org/consolidate/-/consolidate-0.16.0.tgz"; + sha512 = "Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ=="; }; }; "constant-case-3.0.3" = { @@ -13487,6 +13640,15 @@ let sha512 = "mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w=="; }; }; + "crc32-stream-4.0.0" = { + name = "crc32-stream"; + packageName = "crc32-stream"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.0.tgz"; + sha512 = "tyMw2IeUX6t9jhgXI6um0eKfWq4EIDpfv5m7GX4Jzp7eVelQ360xd8EPXJhp2mHwLQIkqlnMLjzqSZI3a+0wRw=="; + }; + }; "create-ecdh-4.0.4" = { name = "create-ecdh"; packageName = "create-ecdh"; @@ -14153,6 +14315,168 @@ let sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; }; }; + "d3-array-2.7.1" = { + name = "d3-array"; + packageName = "d3-array"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-array/-/d3-array-2.7.1.tgz"; + sha512 = "dYWhEvg1L2+osFsSqNHpXaPQNugLT4JfyvbLE046I2PDcgYGFYc0w24GSJwbmcjjZYOPC3PNP2S782bWUM967Q=="; + }; + }; + "d3-color-2.0.0" = { + name = "d3-color"; + packageName = "d3-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz"; + sha512 = "SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ=="; + }; + }; + "d3-delaunay-5.3.0" = { + name = "d3-delaunay"; + packageName = "d3-delaunay"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-5.3.0.tgz"; + sha512 = "amALSrOllWVLaHTnDLHwMIiz0d1bBu9gZXd1FiLfXf8sHcX9jrcj81TVZOqD4UX7MgBZZ07c8GxzEgBpJqc74w=="; + }; + }; + "d3-dispatch-2.0.0" = { + name = "d3-dispatch"; + packageName = "d3-dispatch"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-2.0.0.tgz"; + sha512 = "S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA=="; + }; + }; + "d3-dsv-2.0.0" = { + name = "d3-dsv"; + packageName = "d3-dsv"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-dsv/-/d3-dsv-2.0.0.tgz"; + sha512 = "E+Pn8UJYx9mViuIUkoc93gJGGYut6mSDKy2+XaPwccwkRGlR+LO97L2VCCRjQivTwLHkSnAJG7yo00BWY6QM+w=="; + }; + }; + "d3-force-2.1.1" = { + name = "d3-force"; + packageName = "d3-force"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-force/-/d3-force-2.1.1.tgz"; + sha512 = "nAuHEzBqMvpFVMf9OX75d00OxvOXdxY+xECIXjW6Gv8BRrXu6gAWbv/9XKrvfJ5i5DCokDW7RYE50LRoK092ew=="; + }; + }; + "d3-format-2.0.0" = { + name = "d3-format"; + packageName = "d3-format"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz"; + sha512 = "Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA=="; + }; + }; + "d3-geo-2.0.1" = { + name = "d3-geo"; + packageName = "d3-geo"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.1.tgz"; + sha512 = "M6yzGbFRfxzNrVhxDJXzJqSLQ90q1cCyb3EWFZ1LF4eWOBYxFypw7I/NFVBNXKNqxv1bqLathhYvdJ6DC+th3A=="; + }; + }; + "d3-geo-projection-3.0.0" = { + name = "d3-geo-projection"; + packageName = "d3-geo-projection"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-3.0.0.tgz"; + sha512 = "1JE+filVbkEX2bT25dJdQ05iA4QHvUwev6o0nIQHOSrNlHCAKfVss/U10vEM3pA4j5v7uQoFdQ4KLbx9BlEbWA=="; + }; + }; + "d3-hierarchy-2.0.0" = { + name = "d3-hierarchy"; + packageName = "d3-hierarchy"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-2.0.0.tgz"; + sha512 = "SwIdqM3HxQX2214EG9GTjgmCc/mbSx4mQBn+DuEETubhOw6/U3fmnji4uCVrmzOydMHSO1nZle5gh6HB/wdOzw=="; + }; + }; + "d3-interpolate-2.0.1" = { + name = "d3-interpolate"; + packageName = "d3-interpolate"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz"; + sha512 = "c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ=="; + }; + }; + "d3-path-2.0.0" = { + name = "d3-path"; + packageName = "d3-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-path/-/d3-path-2.0.0.tgz"; + sha512 = "ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA=="; + }; + }; + "d3-quadtree-2.0.0" = { + name = "d3-quadtree"; + packageName = "d3-quadtree"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-2.0.0.tgz"; + sha512 = "b0Ed2t1UUalJpc3qXzKi+cPGxeXRr4KU9YSlocN74aTzp6R/Ud43t79yLLqxHRWZfsvWXmbDWPpoENK1K539xw=="; + }; + }; + "d3-scale-3.2.2" = { + name = "d3-scale"; + packageName = "d3-scale"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.2.tgz"; + sha512 = "3Mvi5HfqPFq0nlyeFlkskGjeqrR/790pINMHc4RXKJ2E6FraTd3juaRIRZZHyMAbi3LjAMW0EH4FB1WgoGyeXg=="; + }; + }; + "d3-shape-2.0.0" = { + name = "d3-shape"; + packageName = "d3-shape"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-shape/-/d3-shape-2.0.0.tgz"; + sha512 = "djpGlA779ua+rImicYyyjnOjeubyhql1Jyn1HK0bTyawuH76UQRWXd+pftr67H6Fa8hSwetkgb/0id3agKWykw=="; + }; + }; + "d3-time-2.0.0" = { + name = "d3-time"; + packageName = "d3-time"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-time/-/d3-time-2.0.0.tgz"; + sha512 = "2mvhstTFcMvwStWd9Tj3e6CEqtOivtD8AUiHT8ido/xmzrI9ijrUUihZ6nHuf/vsScRBonagOdj0Vv+SEL5G3Q=="; + }; + }; + "d3-time-format-3.0.0" = { + name = "d3-time-format"; + packageName = "d3-time-format"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz"; + sha512 = "UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag=="; + }; + }; + "d3-timer-2.0.0" = { + name = "d3-timer"; + packageName = "d3-timer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-timer/-/d3-timer-2.0.0.tgz"; + sha512 = "TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA=="; + }; + }; "dag-map-1.0.2" = { name = "dag-map"; packageName = "dag-map"; @@ -14414,13 +14738,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.8.35" = { + "dayjs-1.8.36" = { name = "dayjs"; packageName = "dayjs"; - version = "1.8.35"; + version = "1.8.36"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.35.tgz"; - sha512 = "isAbIEenO4ilm6f8cpqvgjZCsuerDAz2Kb7ri201AiNn58aqXuaLJEnCtfIMdCvERZHNGRY5lDMTr/jdAnKSWQ=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.36.tgz"; + sha512 = "3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw=="; }; }; "deasync-0.1.15" = { @@ -15044,6 +15368,15 @@ let sha512 = "BLHItGr82rUbHhjMu41d+vw9Md49i81jmZSV00HdTq4t+RTHywmEht/23mNFpUl2YeLYJZJyGz4rdlMAyOxNeg=="; }; }; + "delaunator-4.0.1" = { + name = "delaunator"; + packageName = "delaunator"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/delaunator/-/delaunator-4.0.1.tgz"; + sha512 = "WNPWi1IRKZfCt/qIDMfERkDp93+iZEmOxN2yy4Jg+Xhv8SLk2UTqqbe1sfiipn0and9QrE914/ihdx82Y/Giag=="; + }; + }; "delay-4.4.0" = { name = "delay"; packageName = "delay"; @@ -16124,6 +16457,15 @@ let sha512 = "xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ=="; }; }; + "download-8.0.0" = { + name = "download"; + packageName = "download"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/download/-/download-8.0.0.tgz"; + sha512 = "ASRY5QhDk7FK+XrQtQyvhpDKanLluEEQtWl/J7Lxuf/b+i8RYh997QeXvL85xitrmRKVlx9c7eTrcRdq2GS4eA=="; + }; + }; "download-git-repo-1.1.0" = { name = "download-git-repo"; packageName = "download-git-repo"; @@ -16439,13 +16781,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.567" = { + "electron-to-chromium-1.3.570" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.567"; + version = "1.3.570"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.567.tgz"; - sha512 = "1aKkw0Hha1Bw9JA5K5PT5eFXC/TXbkJvUfNSNEciPUMgSIsRJZM1hF2GUEAGZpAbgvd8En21EA+Lv820KOhvqA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.570.tgz"; + sha512 = "Y6OCoVQgFQBP5py6A/06+yWxUZHDlNr/gNDGatjH8AZqXl8X0tE4LfjLJsXGz/JmWJz8a6K7bR1k+QzZ+k//fg=="; }; }; "elegant-spinner-1.0.1" = { @@ -17160,13 +17502,13 @@ let sha512 = "VHDcDg9AwFoeQU9ULPCJCw6P95gr9Er65M+bccefEVD/OOb+WMyQIYw58rpm0F+zcfRJNf394I+BMH8JeU97Hw=="; }; }; - "escalade-3.0.2" = { + "escalade-3.1.0" = { name = "escalade"; packageName = "escalade"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz"; - sha512 = "gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ=="; + url = "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz"; + sha512 = "mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig=="; }; }; "escape-goat-2.1.1" = { @@ -18600,6 +18942,15 @@ let sha1 = "f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"; }; }; + "fastest-levenshtein-1.0.12" = { + name = "fastest-levenshtein"; + packageName = "fastest-levenshtein"; + version = "1.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz"; + sha512 = "On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="; + }; + }; "fastparse-1.1.2" = { name = "fastparse"; packageName = "fastparse"; @@ -18780,6 +19131,15 @@ let sha512 = "uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw=="; }; }; + "file-type-11.1.0" = { + name = "file-type"; + packageName = "file-type"; + version = "11.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-11.1.0.tgz"; + sha512 = "rM0UO7Qm9K7TWTtA6AShI/t7H5BPjDeGVDaNyg9BjHAj3PysKy7+8C8D137R88jnR3rFJZQB/tFgydl5sN5m7g=="; + }; + }; "file-type-14.7.1" = { name = "file-type"; packageName = "file-type"; @@ -18879,6 +19239,15 @@ let sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA=="; }; }; + "filenamify-3.0.0" = { + name = "filenamify"; + packageName = "filenamify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filenamify/-/filenamify-3.0.0.tgz"; + sha512 = "5EFZ//MsvJgXjBAFJ+Bh2YaCTRF/VP1YOmGrgt+KJ4SFRLjI87EIdwLLuT6wQX0I4F9W41xutobzczjsOKlI/g=="; + }; + }; "filenamify-4.1.0" = { name = "filenamify"; packageName = "filenamify"; @@ -18897,6 +19266,15 @@ let sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; }; }; + "filesize-6.1.0" = { + name = "filesize"; + packageName = "filesize"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz"; + sha512 = "LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg=="; + }; + }; "filestream-5.0.0" = { name = "filestream"; packageName = "filestream"; @@ -19266,13 +19644,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.133.0" = { + "flow-parser-0.134.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.133.0"; + version = "0.134.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.133.0.tgz"; - sha512 = "ONvDDUcQVY7bMQG4ht7Ti+2IYjBBPphkc7fGmHXZHrrNNjGG4tykLZjIrIx710/k77x2djaY9VKlHC342Luy3A=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.134.0.tgz"; + sha512 = "VmRba5YXKmVqIH3xNzUJ4pNobxXEOl6h36m+0f5dZ6/av9YlRpls/yBnPESQ4qBUbyyp7iqoc1Feo1lFw3u1YQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -20481,13 +20859,13 @@ let sha1 = "ee95be37106fd8748a96f8d1db4baea89e1bfa8a"; }; }; - "gh-release-fetch-1.0.3" = { + "gh-release-fetch-1.0.4" = { name = "gh-release-fetch"; packageName = "gh-release-fetch"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-1.0.3.tgz"; - sha512 = "Av+27/G9dJT5iPjFGZcHbjKJcTO1FrGIFQ3e8//9PJtNbK1QKbtm++R/rn8+OXH5ebtMGtXcVdyZrQLyf16i7g=="; + url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-1.0.4.tgz"; + sha512 = "uL2T1vCOr5HAuY1Cbtj+h1AOTWZ0Qvubi1s7KCRqKOiytVlTDHLYoPJ9TIJLEmNYbmuCtZVOtYsojf3REAAgbQ=="; }; }; "git-apply-delta-0.0.7" = { @@ -23291,13 +23669,13 @@ let sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; }; }; - "inflected-2.0.4" = { + "inflected-2.1.0" = { name = "inflected"; packageName = "inflected"; - version = "2.0.4"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/inflected/-/inflected-2.0.4.tgz"; - sha512 = "HQPzFLTTUvwfeUH6RAGjD8cHS069mBqXG5n4qaxX7sJXBhVQrsGgF+0ZJGkSuN6a8pcUWB/GXStta11kKi/WvA=="; + url = "https://registry.npmjs.org/inflected/-/inflected-2.1.0.tgz"; + sha512 = "hAEKNxvHf2Iq3H60oMBHkB4wl5jn3TPF3+fXek/sRwAB5gP9xWs4r7aweSF95f99HFoz69pnZTcu8f0SIHV18w=="; }; }; "inflight-1.0.6" = { @@ -25991,6 +26369,15 @@ let sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; }; }; + "json-stringify-pretty-compact-2.0.0" = { + name = "json-stringify-pretty-compact"; + packageName = "json-stringify-pretty-compact"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz"; + sha512 = "WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ=="; + }; + }; "json-stringify-safe-5.0.1" = { name = "json-stringify-safe"; packageName = "json-stringify-safe"; @@ -26072,6 +26459,15 @@ let sha512 = "b0EBt8SWFNnixVdvoR2ZtEGa9ZqLhbJnOjezn+WP+8kspFm+PFYDN8Z4Bc7pRlDjvuVcADSUkroIuTWWn/YiIA=="; }; }; + "jsonc-parser-2.3.1" = { + name = "jsonc-parser"; + packageName = "jsonc-parser"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz"; + sha512 = "H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="; + }; + }; "jsonfile-1.0.1" = { name = "jsonfile"; packageName = "jsonfile"; @@ -26559,13 +26955,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.0.1" = { + "keyv-4.0.3" = { name = "keyv"; packageName = "keyv"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.0.1.tgz"; - sha512 = "xz6Jv6oNkbhrFCvCP7HQa8AaII8y8LRpoSm661NOKLr4uHuBwhX4epXrPQgF3+xdJnN4Esm5X0xwY4bOlALOtw=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz"; + sha512 = "zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA=="; }; }; "killable-1.0.1" = { @@ -27279,6 +27675,15 @@ let sha512 = "gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ=="; }; }; + "listenercount-1.0.1" = { + name = "listenercount"; + packageName = "listenercount"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz"; + sha1 = "84c8a72ab59c4725321480c975e6508342e70937"; + }; + }; "listr-0.14.3" = { name = "listr"; packageName = "listr"; @@ -28674,15 +29079,6 @@ let sha512 = "ILKe88NeMt4gmDvk/eb615U/IVn7K9KWGkoYbdatQ69Z65nj1ZzjM6fHXfcs0Uge+e+EGnMW7DY4T9yko8vWFg=="; }; }; - "log4js-5.3.0" = { - name = "log4js"; - packageName = "log4js"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-5.3.0.tgz"; - sha512 = "PZHXaXJKMKEscvQxSnTjM4UosQalSDlNpMw63eCKW+/DiAFKIZPW1jGyIPXZDjiEYFusMfiI7zzvnxeGozUcAw=="; - }; - }; "log4js-6.3.0" = { name = "log4js"; packageName = "log4js"; @@ -30249,13 +30645,13 @@ let sha1 = "401fdec7ec21cdb9e03cd3d3021398da21b27085"; }; }; - "metals-languageclient-0.3.0" = { + "metals-languageclient-0.3.1" = { name = "metals-languageclient"; packageName = "metals-languageclient"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.3.0.tgz"; - sha512 = "Uh3jj6+b/vWdR3k1BqC8QZK3a/5Z9mVdI+OhVbFGMq6slJ6odFLTDaDZ25zpon4MaLEs+IIC4R91pJcmFdU6og=="; + url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.3.1.tgz"; + sha512 = "+bxUq6HmdHlqEBIyCyr41KsoLJLQ4DRBn9sVXPhZUlhoA/pBMNSq4LVlLUEnBvRYMhxwbAGV6XYuUMKd0vMokA=="; }; }; "metalsmith-2.3.0" = { @@ -32005,13 +32401,13 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-4.3.13" = { + "netlify-4.5.1" = { name = "netlify"; packageName = "netlify"; - version = "4.3.13"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-4.3.13.tgz"; - sha512 = "nXiqUm89HOEGOzYiLtxGOUCZ+iJB01zxCMeolaQXaIia6UnFCw/jHMARGXMLpntxkgjclaMgMVzKO3aetbHAvQ=="; + url = "https://registry.npmjs.org/netlify/-/netlify-4.5.1.tgz"; + sha512 = "Ke6lXulj8Jd4qzAmHv5VHvqAWoV+EkQUKiBDvpZuUAGA12UDRP4vl7gvJkxmwZ5Z/trIOgiOC9n8y/NHlvFbXA=="; }; }; "netlify-redirect-parser-2.5.0" = { @@ -32230,13 +32626,13 @@ let sha512 = "ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA=="; }; }; - "node-appc-1.1.0" = { + "node-appc-1.1.1" = { name = "node-appc"; packageName = "node-appc"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-appc/-/node-appc-1.1.0.tgz"; - sha512 = "lKi9ZKfvgxBSM7KoMFPeZhSgzPBYE3cci6D145i92T/lhaDbEAoWDf9EAJPX0MRFNTZP1C8gDIlug8y6Oykp2g=="; + url = "https://registry.npmjs.org/node-appc/-/node-appc-1.1.1.tgz"; + sha512 = "QYOmRUq9B0LfVZ5MWQlbv8tHa4pzQ+YbagjUUvMIx6lVjhCjG9pPMRyPFK7/HXiQ+WrsiuydSbJgsBZt1p18Rg=="; }; }; "node-bitmap-0.0.1" = { @@ -32357,6 +32753,15 @@ let sha512 = "iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg=="; }; }; + "node-forge-0.10.0" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz"; + sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="; + }; + }; "node-forge-0.2.24" = { name = "node-forge"; packageName = "node-forge"; @@ -32375,15 +32780,6 @@ let sha512 = "sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw=="; }; }; - "node-forge-0.9.0" = { - name = "node-forge"; - packageName = "node-forge"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz"; - sha512 = "7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ=="; - }; - }; "node-forge-0.9.1" = { name = "node-forge"; packageName = "node-forge"; @@ -33284,13 +33680,13 @@ let sha512 = "LP5F1dhjULEJV5oGRg6ROztH2FddzttrrUEwq5J2GB2Zy938mg0vwt1+Rthn/qqDHtj4Qgq21duNGHh+Ew1wUg=="; }; }; - "oas-resolver-2.4.4" = { + "oas-resolver-2.5.0" = { name = "oas-resolver"; packageName = "oas-resolver"; - version = "2.4.4"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.4.4.tgz"; - sha512 = "670+SM5CXYrjI547cgUeQTdB1wJb2gyrJ7bnGywQMrmciKXhXj/EFbE/8c8wed+j1WmGAh7xS+QdQxiuIlNqlw=="; + url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.0.tgz"; + sha512 = "69OF0iCTDXXp3ttAEPUcCz/eSJd6eyrWAIrPit2wnL7Q4Ti82Q2dXQVMdz5S+JPCgtZOETnTgPs/EsMuH2vIzg=="; }; }; "oas-schema-walker-1.1.5" = { @@ -33663,13 +34059,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.137.1" = { + "office-ui-fabric-react-7.138.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.137.1"; + version = "7.138.0"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.137.1.tgz"; - sha512 = "6m1M9m5psaJqhWwroVp1L0G8q66scLMsQRi+gQ/fY3f75ipGSABGeQ86d4P0ilKaYcLVYIzosocPIZKLbBVpnQ=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.138.0.tgz"; + sha512 = "HW4ugd+x7Jg96yBWxmUNMfkTS0U8RMwf5mGsHBAvW9s5l1ektjTjKnb5beHxNrddXKqcjz9ZThdTk/Gxds0jig=="; }; }; "omggif-1.0.10" = { @@ -36463,6 +36859,15 @@ let sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw=="; }; }; + "postcss-7.0.34" = { + name = "postcss"; + packageName = "postcss"; + version = "7.0.34"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.34.tgz"; + sha512 = "H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw=="; + }; + }; "postcss-calc-7.0.4" = { name = "postcss-calc"; packageName = "postcss-calc"; @@ -36571,13 +36976,13 @@ let sha512 = "7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA=="; }; }; - "postcss-load-config-2.1.0" = { + "postcss-load-config-2.1.1" = { name = "postcss-load-config"; packageName = "postcss-load-config"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz"; - sha512 = "4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q=="; + url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.1.tgz"; + sha512 = "D2ENobdoZsW0+BHy4x1CAkXtbXtYWYRIxL/JbtRBqrRGOPtJ2zoga/bEZWhV/ShWB5saVxJMzbMdSyA/vv4tXw=="; }; }; "postcss-markdown-0.36.0" = { @@ -37165,13 +37570,13 @@ let sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; }; }; - "prettier-2.1.1" = { + "prettier-2.1.2" = { name = "prettier"; packageName = "prettier"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.1.1.tgz"; - sha512 = "9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz"; + sha512 = "16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg=="; }; }; "prettier-bytes-1.0.4" = { @@ -37543,6 +37948,15 @@ let sha512 = "UpcYW5S1RaNKT6pd+s9jp9K9rlQge1UXKskec0j6Mmuq7UJCvlS2J2/s/yuPN8ehftf9HXMxWlKiPbGGUzpoRg=="; }; }; + "promise.prototype.finally-3.1.2" = { + name = "promise.prototype.finally"; + packageName = "promise.prototype.finally"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz"; + sha512 = "A2HuJWl2opDH0EafgdjwEw7HysI8ff/n4lW4QEVBCUXFk9QeGecBWv0Deph0UmLe3tTNYegz8MOjsVuE6SMoJA=="; + }; + }; "promised-temp-0.1.0" = { name = "promised-temp"; packageName = "promised-temp"; @@ -39415,6 +39829,15 @@ let sha512 = "+oZJurc4hXpaaqsN68GoZGQAQIA3qr09Or4fqEsargABnbe5Aau8hFn6ISVleT3cpY/0n/8drn7huyyEvTbghA=="; }; }; + "readdir-glob-1.0.0" = { + name = "readdir-glob"; + packageName = "readdir-glob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.0.0.tgz"; + sha512 = "km0DIcwQVZ1ZUhXhMWpF74/Wm5aFEd5/jDiVWF1Hkw2myPQovG8vCQ8+FQO2KXE9npQQvCnAMZhhWuUee4WcCQ=="; + }; + }; "readdir-scoped-modules-1.1.0" = { name = "readdir-scoped-modules"; packageName = "readdir-scoped-modules"; @@ -39739,13 +40162,13 @@ let sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="; }; }; - "regexpu-core-4.7.0" = { + "regexpu-core-4.7.1" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz"; - sha512 = "TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz"; + sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ=="; }; }; "registry-auth-token-3.3.2" = { @@ -39946,13 +40369,13 @@ let sha1 = "592a347bdd3d5881f4f080c98b5b152fb1407a92"; }; }; - "remark-mdx-2.0.0-next.7" = { + "remark-mdx-2.0.0-next.8" = { name = "remark-mdx"; packageName = "remark-mdx"; - version = "2.0.0-next.7"; + version = "2.0.0-next.8"; src = fetchurl { - url = "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-next.7.tgz"; - sha512 = "JHYCfxJzvjTw8h5y10f+mCvbfIt5klAkWlULqPu1nM/r6ghF3tzJl0AFQFj5b/m/7U553+yYb/y4n0julMERYA=="; + url = "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-next.8.tgz"; + sha512 = "mjP0yo6BgjYrx5a+gKWYRFWbGnRiWi4Fdf17xGCr9VkSMnG4Dyo06spqbaLfHwl0KkQ/RQZlR2sn1mKnYduJdw=="; }; }; "remark-message-control-6.0.0" = { @@ -40837,13 +41260,13 @@ let sha1 = "df43e80d9bc82ad4430bcfef03f49c717e8b2e8c"; }; }; - "roarr-2.15.3" = { + "roarr-2.15.4" = { name = "roarr"; packageName = "roarr"; - version = "2.15.3"; + version = "2.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/roarr/-/roarr-2.15.3.tgz"; - sha512 = "AEjYvmAhlyxOeB9OqPUzQCo3kuAkNfuDk/HqWbZdFsqDFpapkTjiw+p4svNEoRLvuqNTxqfL+s+gtD4eDgZ+CA=="; + url = "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz"; + sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; }; }; "rollup-1.32.1" = { @@ -40855,13 +41278,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.26.11" = { + "rollup-2.27.1" = { name = "rollup"; packageName = "rollup"; - version = "2.26.11"; + version = "2.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.26.11.tgz"; - sha512 = "xyfxxhsE6hW57xhfL1I+ixH8l2bdoIMaAecdQiWF3N7IgJEMu99JG+daBiSZQjnBpzFxa0/xZm+3pbCdAQehHw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.27.1.tgz"; + sha512 = "GiWHQvnmMgBktSpY/1+nrGpwPsTw4b9P28og2uedfeq4JZ16rzAmnQ5Pm/E0/BEmDNia1ZbY7+qu3nBgNa19Hg=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -41062,6 +41485,15 @@ let sha1 = "9a084e7b860b17bff3015b92c67a6a336191513a"; }; }; + "rw-1.3.3" = { + name = "rw"; + packageName = "rw"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz"; + sha1 = "3f862dfa91ab766b14885ef4d01124bfda074fb4"; + }; + }; "rwlock-5.0.0" = { name = "rwlock"; packageName = "rwlock"; @@ -41314,13 +41746,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.26.10" = { + "sass-1.26.11" = { name = "sass"; packageName = "sass"; - version = "1.26.10"; + version = "1.26.11"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.26.10.tgz"; - sha512 = "bzN0uvmzfsTvjz0qwccN1sPm2HxxpNI/Xa+7PlUEMS+nQvbyuEK7Y0qFqxlPHhiNHb1Ze8WQJtU31olMObkAMw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.26.11.tgz"; + sha512 = "W1l/+vjGjIamsJ6OnTe0K37U2DBO/dgsv2Z4c89XQ8ZOO6l/VwkqwLSqoYzJeJs6CLuGSTRWc91GbQFL3lvrvw=="; }; }; "sass-formatter-0.4.15" = { @@ -41503,13 +41935,13 @@ let sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; }; }; - "selfsigned-1.10.7" = { + "selfsigned-1.10.8" = { name = "selfsigned"; packageName = "selfsigned"; - version = "1.10.7"; + version = "1.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz"; - sha512 = "8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA=="; + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz"; + sha512 = "2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w=="; }; }; "semaphore-async-await-1.5.1" = { @@ -41710,15 +42142,6 @@ let sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; }; }; - "semver-regex-2.0.0" = { - name = "semver-regex"; - packageName = "semver-regex"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz"; - sha512 = "mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw=="; - }; - }; "semver-truncate-1.1.2" = { name = "semver-truncate"; packageName = "semver-truncate"; @@ -41827,6 +42250,15 @@ let sha512 = "GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw=="; }; }; + "serialize-javascript-5.0.1" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; + }; + }; "serialize-to-js-3.1.1" = { name = "serialize-to-js"; packageName = "serialize-to-js"; @@ -42340,6 +42772,15 @@ let sha512 = "xauHm1YqCTom1sC9eOjfq3/9RKiUA9iPnxBbrY2DdL8l4ADMu0jjM5l5lphQP5YWNqAL2aXC/OeuQ76vHtW5fg=="; }; }; + "simple-git-2.20.1" = { + name = "simple-git"; + packageName = "simple-git"; + version = "2.20.1"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.20.1.tgz"; + sha512 = "aa9s2ZLjXlHCVGbDXQLInMLvLkxKEclqMU9X5HMXi3tLWLxbWObz1UgtyZha6ocHarQtFp0OjQW9KHVR1g6wbA=="; + }; + }; "simple-git-2.5.0" = { name = "simple-git"; packageName = "simple-git"; @@ -42709,22 +43150,22 @@ let sha512 = "wwrMIEDozfLJ8LmakCsCC1FQ0siIX5icCQPCbUKKgRbeVsZ27NjPJs37BpTXX4rcHkaWpe8TbH3yOtp23qmszg=="; }; }; - "snyk-cpp-plugin-1.4.3" = { + "snyk-cpp-plugin-1.5.0" = { name = "snyk-cpp-plugin"; packageName = "snyk-cpp-plugin"; - version = "1.4.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-1.4.3.tgz"; - sha512 = "dHnYm6SVk+LGDqXaVwZqg6+0dMNjjPgJ3S3XUhjTWtGHqvokAdK5iGqSvwbQbJGOikEqt0rjnkorsgnGD/TbjQ=="; + url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-1.5.0.tgz"; + sha512 = "nBZ0cBmpT4RVJUFzYydQJOxwjcdXk7NtRJE1UIIOafQa2FcvIl3GBezfrCJ6pu61svOAf5r8Qi/likx6F15K1A=="; }; }; - "snyk-docker-plugin-3.20.0" = { + "snyk-docker-plugin-3.21.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "3.20.0"; + version = "3.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.20.0.tgz"; - sha512 = "E2aZW3CWeb4tJrQF9DgeJQsDHwRikkUkJh1eTmkksBBDH/wj0gjab9fRE8N0Lu04OQa8LRA4CW7VRdo/QjLjUA=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.21.0.tgz"; + sha512 = "A7oJS3QGR7bwm1qeeczCb8PDfi8go1KM6VWph/drJHBQ7JxVKKLb3j4AzrMmIM96mGZFbmyNOL4pznwumaOM8g=="; }; }; "snyk-go-parser-1.4.1" = { @@ -43420,13 +43861,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.5" = { + "spdx-license-ids-3.0.6" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; + sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="; }; }; "spdy-1.32.5" = { @@ -44752,13 +45193,13 @@ let sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; }; }; - "string.prototype.trim-1.2.1" = { + "string.prototype.trim-1.2.2" = { name = "string.prototype.trim"; packageName = "string.prototype.trim"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz"; - sha512 = "MjGFEeqixw47dAMFMtgUro/I0+wNqZB5GKXGt1fFr24u3TzDXCPu7J9Buppzoe3r/LqkSDLDDJzE15RGWDGAVw=="; + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.2.tgz"; + sha512 = "b5yrbl3BXIjHau9Prk7U0RRYcUYdN4wGSVaqoBQS50CCE3KBuYU0TYRNPFCP7aVoNMX87HKThdMRVIP3giclKg=="; }; }; "string.prototype.trimend-1.0.1" = { @@ -45598,13 +46039,13 @@ let sha512 = "hAu/ig5N8i0trXXbrC7rwbXV4DhpEAsZhYXDs1305OjmDgjGC0thINbb0197idy3Pp+B6w7u426SUM43GAP7qw=="; }; }; - "swagger-ui-dist-3.33.0" = { + "swagger-ui-dist-3.34.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.33.0"; + version = "3.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.33.0.tgz"; - sha512 = "IIF2OFr2+nFNDvQtQ/ZxC+qVQhFguV7UztD6nzdfkN4P7nOuM0amEa/8er7MKSFArc4rKGH4WkihUQczbBfUag=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.34.0.tgz"; + sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; "swagger2openapi-5.4.0" = { @@ -45688,13 +46129,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.27.3" = { + "systeminformation-4.27.5" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.27.3"; + version = "4.27.5"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.3.tgz"; - sha512 = "0Nc8AYEK818h7FI+bbe/kj7xXsMD5zOHvO9alUqQH/G4MHXu5tHQfWqC/bzWOk4JtoQPhnyLgxMYncDA2eeSBw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.5.tgz"; + sha512 = "EysogxKqREk54ZYDEFcsCODv8GymKZcyiSfegYit8dKhPjzuQr+KX4GFHjssWjYrWFEIM2bYNsFrZX5eufeAXg=="; }; }; "syswide-cas-5.3.0" = { @@ -46364,6 +46805,15 @@ let sha512 = "enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ=="; }; }; + "through2-4.0.2" = { + name = "through2"; + packageName = "through2"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz"; + sha512 = "iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw=="; + }; + }; "through2-filter-3.0.0" = { name = "through2-filter"; packageName = "through2-filter"; @@ -46904,6 +47354,15 @@ let sha512 = "ePZfjs1ajL4b8jT4MeVId+9Ci5hJCzAtNIEXIHyFYmKmQuX+eHC/RNv6tuLMUhrGrhJ+sYWW/lBF/LKILHGZEA=="; }; }; + "topojson-client-3.1.0" = { + name = "topojson-client"; + packageName = "topojson-client"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/topojson-client/-/topojson-client-3.1.0.tgz"; + sha512 = "605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw=="; + }; + }; "topsort-0.0.2" = { name = "topsort"; packageName = "topsort"; @@ -47705,13 +48164,13 @@ let sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw=="; }; }; - "typescript-4.0.2" = { + "typescript-4.0.3" = { name = "typescript"; packageName = "typescript"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz"; - sha512 = "e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz"; + sha512 = "tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="; }; }; "typescript-eslint-parser-16.0.1" = { @@ -48695,6 +49154,15 @@ let sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; }; }; + "unzipper-0.10.11" = { + name = "unzipper"; + packageName = "unzipper"; + version = "0.10.11"; + src = fetchurl { + url = "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz"; + sha512 = "+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw=="; + }; + }; "upath-1.2.0" = { name = "upath"; packageName = "upath"; @@ -49181,6 +49649,15 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; + "uuid-7.0.3" = { + name = "uuid"; + packageName = "uuid"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz"; + sha512 = "DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="; + }; + }; "uuid-8.3.0" = { name = "uuid"; packageName = "uuid"; @@ -49397,6 +49874,267 @@ let sha1 = "cfde751860a15822db3b132bc59b116a4adaf01b"; }; }; + "vega-5.15.0" = { + name = "vega"; + packageName = "vega"; + version = "5.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega/-/vega-5.15.0.tgz"; + sha512 = "uygUtkZJm3/HNvNGLQSugZld4qvaiOMtH34tOGuS/MSGj7MaP0CLoFrthlas30lyMPQ42UfzX8tk5X+I91dFKQ=="; + }; + }; + "vega-canvas-1.2.4" = { + name = "vega-canvas"; + packageName = "vega-canvas"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-canvas/-/vega-canvas-1.2.4.tgz"; + sha512 = "BI44AIAa13xSindGXMQm0FAhI2zx3F3conFmXhey63hqGsfvH/19nv+A0PEvSVa/lK4iPneMTpw583iffDiq3w=="; + }; + }; + "vega-crossfilter-4.0.4" = { + name = "vega-crossfilter"; + packageName = "vega-crossfilter"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.0.4.tgz"; + sha512 = "mXKhHxkgxJPwtTrMgK3Uw1bStfD+rmfKXsUvdIh1ZwmpheGOQM2Uflo3tQNh9j9wqu8xHywCcddohKpSRBt8HQ=="; + }; + }; + "vega-dataflow-5.7.2" = { + name = "vega-dataflow"; + packageName = "vega-dataflow"; + version = "5.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-dataflow/-/vega-dataflow-5.7.2.tgz"; + sha512 = "O6CEchGAQtEhDKfI3UHWVUbUcXSMsq5JrefvvB2hldx3XbHkEQioXtgAnK6OosyKpB1dJlVvFRMR40pwdNO1hw=="; + }; + }; + "vega-encode-4.8.2" = { + name = "vega-encode"; + packageName = "vega-encode"; + version = "4.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-encode/-/vega-encode-4.8.2.tgz"; + sha512 = "+PEimVqZysvLEScU/EJrpElBrNMcDHeVGmMhLkswxfVrFix4ialV3/iGB9Wcr5g1pOQcsBdNn7qUy2bjvAvIvA=="; + }; + }; + "vega-event-selector-2.0.5" = { + name = "vega-event-selector"; + packageName = "vega-event-selector"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-event-selector/-/vega-event-selector-2.0.5.tgz"; + sha512 = "bRm02Fnd+YrZDni0yr5y9Co1Z1zrjd7hkwY+gi/Y7zDFOxnESGrbYtpHvWT8fL9AqmYU3wDpsJZGyP4htRUNAQ=="; + }; + }; + "vega-expression-2.7.0" = { + name = "vega-expression"; + packageName = "vega-expression"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-expression/-/vega-expression-2.7.0.tgz"; + sha512 = "fMnHtcFfVAxuwjsKGh0qqP8OJNVABGIg0aSp33Jxh1D86LwDwaRe+EtwF1fv8YKD2AEiBl4UObC68QMT56MekQ=="; + }; + }; + "vega-force-4.0.6" = { + name = "vega-force"; + packageName = "vega-force"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-force/-/vega-force-4.0.6.tgz"; + sha512 = "acB5DshAhSbaxKAk/DgzUK4ondTAZbD3tRY4Cy0NmZL+6QqM3RRePM1PQBAFAQMp9kXT9X/fh8tOlMKx/rwQnQ=="; + }; + }; + "vega-format-1.0.3" = { + name = "vega-format"; + packageName = "vega-format"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-format/-/vega-format-1.0.3.tgz"; + sha512 = "hZpYZM/KRNnd+qmJ5oCGHvOzlxga9d2anqw+ji/jbA41piMzsyAa2f8CAoHpXgzsZNkGp+BL2Oya+251uZOjQw=="; + }; + }; + "vega-functions-5.7.3" = { + name = "vega-functions"; + packageName = "vega-functions"; + version = "5.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.7.3.tgz"; + sha512 = "9X9bKhKZvglfRaFIDg2yRyBzayabsQHRAyVk0bJBU04mgfj6myKRhO6JF4av+LgNHyJFsOPeJxkiOYZ3x6Z6rg=="; + }; + }; + "vega-geo-4.3.6" = { + name = "vega-geo"; + packageName = "vega-geo"; + version = "4.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-geo/-/vega-geo-4.3.6.tgz"; + sha512 = "miRnxnf3KSgmHMR0H8y3NSg58BnijVtxg508PDrw3T4ARRYxGf5yglcEYFcc06iRYTV3B43pOg0Se5dLowmTEw=="; + }; + }; + "vega-hierarchy-4.0.8" = { + name = "vega-hierarchy"; + packageName = "vega-hierarchy"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.0.8.tgz"; + sha512 = "8O2asfoAEaW8Hfu/06m6t5BErrNo0OJzU8XyKon8aeGY2YbQMKT7fiEzUrzDC39Zb2suThuzBOjpcwiu7rh/Hg=="; + }; + }; + "vega-loader-4.3.2" = { + name = "vega-loader"; + packageName = "vega-loader"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-loader/-/vega-loader-4.3.2.tgz"; + sha512 = "g+hd4xCxGP4zlSdvvprDrHTulUN1xB1k63ooqtCzhps3fji7N8DQ3RWPTJZLyuwYpjxim3BYrp4aJk3OHElcaA=="; + }; + }; + "vega-parser-6.0.4" = { + name = "vega-parser"; + packageName = "vega-parser"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.0.4.tgz"; + sha512 = "AxFvM0JgS/hyqlIdcN1B74PRO5cpU9SRRh8wBfirHRkFWPxqfP2EeFmQxisGV5wSqAUVTqqqk0suWQuU3YHPcQ=="; + }; + }; + "vega-projection-1.4.4" = { + name = "vega-projection"; + packageName = "vega-projection"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-projection/-/vega-projection-1.4.4.tgz"; + sha512 = "v1Tx/8khpOmzpscXkxq2+MGjs7jG3A8yFfQJ8kTh8eIko0f5V+QLujTfEvdllYXw6f3DE6K2fYInb71B0GAjIw=="; + }; + }; + "vega-regression-1.0.8" = { + name = "vega-regression"; + packageName = "vega-regression"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-regression/-/vega-regression-1.0.8.tgz"; + sha512 = "NdLoDctaxtCKP4udGg2SmplyK8098L8EAFEy/TEECx0wbRcBzPs2e/U4uCShzoPHILFULdOqs+sq/xwhp9X3lA=="; + }; + }; + "vega-runtime-6.1.2" = { + name = "vega-runtime"; + packageName = "vega-runtime"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-runtime/-/vega-runtime-6.1.2.tgz"; + sha512 = "baaMe8PKynJlJfpcZR4jHDSbTM9TYzU4x/XLphQ/6lZnF9WMH+gGOVlVRWZCLH4K0sgCxBMKC/THOpRFkO6jJA=="; + }; + }; + "vega-scale-7.1.0" = { + name = "vega-scale"; + packageName = "vega-scale"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.1.0.tgz"; + sha512 = "8QgHarFLgnX60DL9h91GNSzvXtBVUfCx57+XKUlCROfHti4KASTRMicBgfJ3lwJBACNefpEW+9ut+1iuIHONwQ=="; + }; + }; + "vega-scenegraph-4.9.1" = { + name = "vega-scenegraph"; + packageName = "vega-scenegraph"; + version = "4.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.1.tgz"; + sha512 = "4OyFlMXwecM7C18zrXeBgckzLaFncLdnj1ExcF3dFfsgPLBSRW2x+eCRQZmD12UHoLFGuehB5s3YNfoQtCP5YA=="; + }; + }; + "vega-selections-5.1.3" = { + name = "vega-selections"; + packageName = "vega-selections"; + version = "5.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.1.3.tgz"; + sha512 = "fy+EBPA3pA3i4IeQ2EUHQI83RZMCS4ZoXu1RI1Oa/CFLu8iXxwraRaD9sUH93GPj4pU22g4ywjbHzsrZ7x4ONg=="; + }; + }; + "vega-statistics-1.7.8" = { + name = "vega-statistics"; + packageName = "vega-statistics"; + version = "1.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.7.8.tgz"; + sha512 = "JkxS7hkFLOMBgEOfITQ1kisLGuWtJ0gAhxQ1OmuIx5Un9yyFY3+hk8HSgeZHwIPktsV+2Bx5aPUHES85YzBD/Q=="; + }; + }; + "vega-time-2.0.3" = { + name = "vega-time"; + packageName = "vega-time"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-time/-/vega-time-2.0.3.tgz"; + sha512 = "LXsB5Ej56jcDRvoWHp1YegNuZSD+cFWGBEWobRXbigmRNDfa4HGmzUon46G+KBj+VeRRGeu5Zq4LSG2goWmIYw=="; + }; + }; + "vega-transforms-4.9.2" = { + name = "vega-transforms"; + packageName = "vega-transforms"; + version = "4.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.9.2.tgz"; + sha512 = "vDI8jJOlnswSuEf6BekI04jWNttgOLzDRONaWZGTH8X5yI3GgkB4Ts45U0LayRExQSq7gxt95k/02jXGGzOTpA=="; + }; + }; + "vega-typings-0.18.2" = { + name = "vega-typings"; + packageName = "vega-typings"; + version = "0.18.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.18.2.tgz"; + sha512 = "t7PAmcqPUmSV44l2NVJOoblhomPlgjO7rxAUs/HXnmyVbGHI+6ulUPjGBWWZU1ebu09T+SYazAwjr6lAd2CHgQ=="; + }; + }; + "vega-util-1.15.1" = { + name = "vega-util"; + packageName = "vega-util"; + version = "1.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-util/-/vega-util-1.15.1.tgz"; + sha512 = "kEbRQiVUP42dyou2LF8I+3TlBtk4TODTlnLzdSoI//uahXvDnz1ulfprWljfcHPbVjziObaFNWkpT56oSMTx+g=="; + }; + }; + "vega-view-5.8.2" = { + name = "vega-view"; + packageName = "vega-view"; + version = "5.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-view/-/vega-view-5.8.2.tgz"; + sha512 = "d+u5FGs3t7LUVRoGimvroHkbO2orrtJMUt2P8UVu4alMdDcgZUSmwOZWc/gMkBGlWD8P9q7832xTWdJ3gSXL4A=="; + }; + }; + "vega-view-transforms-4.5.7" = { + name = "vega-view-transforms"; + packageName = "vega-view-transforms"; + version = "4.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.5.7.tgz"; + sha512 = "dcrEHJL/+KPAe7Eq4Me7rq5+O13yWL1X/n3Fu6xKGL2TnBSBy4WVla+WFBdD82GRIU0Fi5DFkL/dE3cTeitvag=="; + }; + }; + "vega-voronoi-4.1.4" = { + name = "vega-voronoi"; + packageName = "vega-voronoi"; + version = "4.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.1.4.tgz"; + sha512 = "z5aAprA9XbdKZ2oAs1tWR9Cw+W9LQJZCn9kH+x6VmnqiVhCbMZPDoZK9sIgso163RDF9Fdu+0zLXX58l+AjzWA=="; + }; + }; + "vega-wordcloud-4.1.2" = { + name = "vega-wordcloud"; + packageName = "vega-wordcloud"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-wordcloud/-/vega-wordcloud-4.1.2.tgz"; + sha512 = "LZzqaRuE0bR9x9e9dLax6GYnUO+MtJhGx5fRk4F0Q8+X2f0u/BfOyMG459tnbyZQIy9SP8ZBLBlkp+ujmK8XXQ=="; + }; + }; "vendors-1.0.4" = { name = "vendors"; packageName = "vendors"; @@ -49757,13 +50495,13 @@ let sha512 = "iTX3dTp0Y0RFWhIux5jasI8r9swdiWVB1Z3OrZ10iDHxzkETjVPxAQ5BEQU4ag0Awc8TTg1C7sJriHQY2LO14g=="; }; }; - "vscode-css-languageservice-4.3.3" = { + "vscode-css-languageservice-4.3.4" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "4.3.3"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.3.3.tgz"; - sha512 = "b2b+0oHvPmBHygDtOXX3xBvpQCa6eIQSvXnGDNSDmIC1894ZTJ2yX10vjplOO/PvV7mwhyvGPwHyY4X2HGxtKw=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.3.4.tgz"; + sha512 = "/0HCaxiSL0Rmm3sJ+iyZekljKEYKo1UHSzX4UFOo5VDLgRhKomJf7g1p8glcbCHXB/70IcH8IhKnwlTznf8RPQ=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -49793,13 +50531,13 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-json-languageservice-3.8.3" = { + "vscode-json-languageservice-3.8.4" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "3.8.3"; + version = "3.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.3.tgz"; - sha512 = "8yPag/NQHCuTthahyaTtzK0DHT0FKM/xBU0mFBQ8nMo8C1i2P+FCyIVqICoNoHkRI2BTGlXKomPUpsqjSz0TnQ=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.4.tgz"; + sha512 = "njDG0+YJvYNKXH+6plQGZMxgbifATFrRpC6Qnm/SAn4IW8bMHxsYunsxrjtpqK42CVSz6Lr7bpbTEZbVuOmFLw=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -50054,6 +50792,15 @@ let sha512 = "7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw=="; }; }; + "vscode-nls-5.0.0" = { + name = "vscode-nls"; + packageName = "vscode-nls"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz"; + sha512 = "u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA=="; + }; + }; "vscode-test-1.4.0" = { name = "vscode-test"; packageName = "vscode-test"; @@ -50135,13 +50882,13 @@ let sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; }; }; - "vue-3.0.0-rc.10" = { + "vue-3.0.0" = { name = "vue"; packageName = "vue"; - version = "3.0.0-rc.10"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-3.0.0-rc.10.tgz"; - sha512 = "nRsyIQtOWLDMBb5dsPwg/WdIqznCMVWN6O6wJSzhseKC768wHlZKcJ7SPHhWPid9wi3Ykhtl9vtgvxTK/qICkw=="; + url = "https://registry.npmjs.org/vue/-/vue-3.0.0.tgz"; + sha512 = "ZMrAARZ32sGIaYKr7Fk2GZEBh/VhulSrGxcGBiAvbN4fhjl3tuJyNFbbbLFqGjndbLoBW66I2ECq8ICdvkKdJw=="; }; }; "vue-cli-plugin-apollo-0.21.3" = { @@ -50405,6 +51152,15 @@ let sha512 = "4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ=="; }; }; + "webpack-4.44.2" = { + name = "webpack"; + packageName = "webpack"; + version = "4.44.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz"; + sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q=="; + }; + }; "webpack-cli-3.3.12" = { name = "webpack-cli"; packageName = "webpack-cli"; @@ -51891,6 +52647,15 @@ let sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; }; }; + "yargs-parser-20.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "20.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.0.0.tgz"; + sha512 = "8eblPHTL7ZWRkyjIZJjnGf+TijiKJSwA24svzLRVvtgoi/RZiKa9fFQTrlx0OKLnyHSdt/enrdadji6WFfESVA=="; + }; + }; "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -52125,6 +52890,15 @@ let sha512 = "r+JdDipt93ttDjsOVPU5zaq5bAyY+3H19bDrThkvuVxC0xMQzU1PJcS6D+KrP3u96gH9XLomcHPb+2skoDjulQ=="; }; }; + "zip-stream-4.0.2" = { + name = "zip-stream"; + packageName = "zip-stream"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/zip-stream/-/zip-stream-4.0.2.tgz"; + sha512 = "TGxB2g+1ur6MHkvM644DuZr8Uzyz0k0OYWtS3YlpfWBEmK4woaC2t3+pozEL3dBfIPmpgmClR5B2QRcMgGt22g=="; + }; + }; "zmq-2.15.3" = { name = "zmq"; packageName = "zmq"; @@ -52149,17 +52923,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-10.1.1.tgz"; - sha512 = "u1Dd2Qe4ShFFef8cehaHoEKOrWo6QONj7yJrlvIIyzcnXWUb3jQmyZoILTv759lRdYF0GrgBx5jCKxzok0jTww=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-10.1.2.tgz"; + sha512 = "dBcqFTuT71CCkH4BoV2cN5RP5k8ggzOBijNNtwkQv7N4gNcdcczhoPtEa2v4Oo8mPcTwxf/C3RXZ+NicdROJOw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1001.1" - sources."@angular-devkit/core-10.1.1" - sources."@angular-devkit/schematics-10.1.1" - sources."@schematics/angular-10.1.1" - sources."@schematics/update-0.1001.1" + sources."@angular-devkit/architect-0.1001.2" + sources."@angular-devkit/core-10.1.2" + sources."@angular-devkit/schematics-10.1.2" + sources."@schematics/angular-10.1.2" + sources."@schematics/update-0.1001.2" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" @@ -52441,7 +53215,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."sshpk-1.16.1" sources."ssri-6.0.1" sources."stream-each-1.2.3" @@ -52505,18 +53279,18 @@ in "@antora/cli" = nodeEnv.buildNodePackage { name = "_at_antora_slash_cli"; packageName = "@antora/cli"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/cli/-/cli-2.3.3.tgz"; - sha512 = "mWxMMWKzTmhmTgAeAVestZf4CRcC4lBD5l521J2fsdGpGx9dQGiwqQZqNcwROJDE+Lg0YfXYYqP1UUKhZwYz6Q=="; + url = "https://registry.npmjs.org/@antora/cli/-/cli-2.3.4.tgz"; + sha512 = "KItaWFEf/X4LLY2XCidjD00oUp4Ay7y9Hu26+T8dPqV+qnMwOL+MGHhYXsJz+4JaeNJu1Ofwc4onmShpwHQruA=="; }; dependencies = [ - sources."@antora/playbook-builder-2.3.3" + sources."@antora/playbook-builder-2.3.4" sources."@iarna/toml-2.2.5" sources."argparse-1.0.10" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."commander-5.1.0" + sources."commander-6.1.0" sources."convict-6.0.0" sources."decamelize-1.2.0" sources."esprima-4.0.1" @@ -52542,24 +53316,24 @@ in "@antora/site-generator-default" = nodeEnv.buildNodePackage { name = "_at_antora_slash_site-generator-default"; packageName = "@antora/site-generator-default"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.3.3.tgz"; - sha512 = "kY2j2gsBo1U4Jn+WqK09chsFgXbbUvafgqGo3SzFDdjpsG/NvIylLK3g+bbZ0X9N7FysXytlAhyAYlOJDvXjGw=="; + url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.3.4.tgz"; + sha512 = "uRiFJ/nG5bxjDmFOur27ae7A1J7r+OFVocEwx+vVLRvVYfNHxYP0fI2uUrmJTci8xJ92NLH9VLHpfsHypsoq9Q=="; }; dependencies = [ - sources."@antora/asciidoc-loader-2.3.3" - sources."@antora/content-aggregator-2.3.3" - sources."@antora/content-classifier-2.3.3" - sources."@antora/document-converter-2.3.3" + sources."@antora/asciidoc-loader-2.3.4" + sources."@antora/content-aggregator-2.3.4" + sources."@antora/content-classifier-2.3.4" + sources."@antora/document-converter-2.3.4" sources."@antora/expand-path-helper-1.0.0" - sources."@antora/navigation-builder-2.3.3" - sources."@antora/page-composer-2.3.3" - sources."@antora/playbook-builder-2.3.3" - sources."@antora/redirect-producer-2.3.3" - sources."@antora/site-mapper-2.3.3" - sources."@antora/site-publisher-2.3.3" - sources."@antora/ui-loader-2.3.3" + sources."@antora/navigation-builder-2.3.4" + sources."@antora/page-composer-2.3.4" + sources."@antora/playbook-builder-2.3.4" + sources."@antora/redirect-producer-2.3.4" + sources."@antora/site-mapper-2.3.4" + sources."@antora/site-publisher-2.3.4" + sources."@antora/ui-loader-2.3.4" sources."@iarna/toml-2.2.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" @@ -52813,7 +53587,7 @@ in }) sources."string_decoder-1.3.0" sources."through-2.3.8" - sources."through2-3.0.2" + sources."through2-4.0.2" (sources."through2-filter-3.0.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -52874,10 +53648,10 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.11.0.tgz"; - sha512 = "H/i+fpbf/W9c446Ud+bDSeoUv5pW03orTm3hwVs9TtCt6332He8PK/CHydFnY/uvMKAmWPG5m2DruWIe7f1XMg=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.12.0.tgz"; + sha512 = "bUyvGm6DOiyLxKwUcGe/ItuSu1/iAHp31hw/c04f4QWyTk2znuyDK/KD6Jn7xqIj1+zRuCVSgUPvRH9R+bfpKg=="; }; dependencies = [ sources."abab-2.0.5" @@ -52942,9 +53716,11 @@ in sources."https-proxy-agent-4.0.0" sources."iconv-lite-0.4.24" sources."inquirer-6.2.0" + sources."is-docker-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-promise-2.2.2" sources."is-typedarray-1.0.0" + sources."is-wsl-2.2.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."jsdom-13.2.0" @@ -52967,6 +53743,7 @@ in sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" sources."onetime-2.0.1" + sources."open-7.1.0" sources."optionator-0.8.3" sources."os-tmpdir-1.0.2" sources."papaparse-4.6.0" @@ -53074,7 +53851,7 @@ in sources."@types/color-name-1.1.1" sources."@types/json-schema-7.0.6" sources."@types/json5-0.0.29" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -53809,7 +54586,7 @@ in sources."@apollo/federation-0.20.0" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.32" + sources."@types/node-10.17.35" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -54105,14 +54882,14 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" ]; }) sources."@types/normalize-package-data-2.4.0" - sources."@types/qs-6.9.4" + sources."@types/qs-6.9.5" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.5" sources."@types/through-0.0.30" @@ -54126,22 +54903,24 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.6" sources."@vue/cli-ui-addon-widgets-4.5.6" - (sources."@vue/compiler-core-3.0.0-rc.10" // { + (sources."@vue/compiler-core-3.0.0" // { dependencies = [ + sources."@babel/types-7.11.5" sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.0.0-rc.10" - (sources."@vue/compiler-sfc-3.0.0-rc.10" // { + sources."@vue/compiler-dom-3.0.0" + (sources."@vue/compiler-sfc-3.0.0" // { dependencies = [ + sources."@babel/types-7.11.5" sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-ssr-3.0.0-rc.10" - sources."@vue/reactivity-3.0.0-rc.10" - sources."@vue/runtime-core-3.0.0-rc.10" - sources."@vue/runtime-dom-3.0.0-rc.10" - sources."@vue/shared-3.0.0-rc.10" + sources."@vue/compiler-ssr-3.0.0" + sources."@vue/reactivity-3.0.0" + sources."@vue/runtime-core-3.0.0" + sources."@vue/runtime-dom-3.0.0" + sources."@vue/shared-3.0.0" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" @@ -54326,7 +55105,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.14.2" + sources."browserslist-4.14.3" sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -54353,7 +55132,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001129" + sources."caniuse-lite-1.0.30001131" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -54453,7 +55232,7 @@ in sources."concat-map-0.0.1" sources."config-chain-1.1.12" sources."configstore-3.1.5" - sources."consolidate-0.15.1" + sources."consolidate-0.16.0" sources."constant-case-3.0.3" (sources."content-disposition-0.5.3" // { dependencies = [ @@ -54561,7 +55340,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.567" + sources."electron-to-chromium-1.3.570" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -54573,7 +55352,7 @@ in sources."error-ex-1.3.2" sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" - sources."escalade-3.0.2" + sources."escalade-3.1.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."esm-3.2.25" @@ -54652,7 +55431,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.133.0" + sources."flow-parser-0.134.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -54804,7 +55583,7 @@ in sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."indexes-of-1.0.1" - sources."inflected-2.0.4" + sources."inflected-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -55157,7 +55936,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.32" // { + (sources."postcss-7.0.34" // { dependencies = [ sources."source-map-0.6.1" sources."supports-color-6.1.0" @@ -55239,7 +56018,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."regexpu-core-4.7.0" + sources."regexpu-core-4.7.1" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."regjsgen-0.5.2" @@ -55350,7 +56129,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -55570,7 +56349,7 @@ in (sources."vue-codemod-0.0.4" // { dependencies = [ sources."globby-10.0.2" - sources."vue-3.0.0-rc.10" + sources."vue-3.0.0" ]; }) sources."watch-1.0.2" @@ -55966,7 +56745,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -56256,7 +57035,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -56506,7 +57285,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.19" + sources."@types/node-13.13.21" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.5" @@ -56827,7 +57606,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."speedometer-0.1.4" sources."srt2vtt-1.3.1" sources."sshpk-1.16.1" @@ -57130,10 +57909,10 @@ in coc-json = nodeEnv.buildNodePackage { name = "coc-json"; packageName = "coc-json"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.0.tgz"; - sha512 = "VqlL+B3EB9yLMXPs3or+Vu2ezVulxI7remhby4NWnvfE3PVpZreoXo5ISNjLrJ5xBQrj4bkJkMcBFkXwkSSH6w=="; + url = "https://registry.npmjs.org/coc-json/-/coc-json-1.3.1.tgz"; + sha512 = "VKCzzCMZYxqjU89EMh8g58ytbhXXQcMSyWx385NXiijjK3Amtuvz775lPfiUeIAeVNr2VM+yeKimUw4pbE/lug=="; }; buildInputs = globalBuildInputs; meta = { @@ -57165,99 +57944,171 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.3.tgz"; - sha512 = "HrD1Mryqkw4IO0IA//GHBvUiI6jqxAhoWPP1/FjYXcTZDOcB7x4CTW3Azg8YiucgbeJTwZgMmg/j+z7ArYdQ/w=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.4.tgz"; + sha512 = "EaDdMssH8XCpXq4rTQOkl8BhiB5eR+pAlV4mARs+jsB6wvJVd6U3Ba6nKuTB7n7HbHbn3tWZWLhclpqByi5G8g=="; }; dependencies = [ - sources."@chemzqm/neovim-5.1.9" + sources."@chemzqm/neovim-5.2.6" + sources."@tootallnate/once-1.1.2" + sources."agent-base-6.0.1" + sources."arch-2.1.2" sources."async-2.6.3" sources."await-semaphore-0.1.3" sources."balanced-match-1.0.0" + sources."big-integer-1.6.48" + sources."binary-0.3.0" + sources."bluebird-3.4.7" sources."brace-expansion-1.1.11" sources."bser-2.1.1" - sources."chownr-1.1.4" - sources."coc.nvim-0.0.77" + sources."buffer-indexof-polyfill-1.0.2" + sources."buffers-0.1.1" + sources."bytes-3.1.0" + sources."chainsaw-0.1.0" + sources."chownr-2.0.0" + sources."clipboardy-2.3.0" + sources."coc.nvim-0.0.79" sources."concat-map-0.0.1" - sources."date-format-2.1.0" + sources."content-disposition-0.5.3" + sources."core-util-is-1.0.2" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + sources."which-1.3.1" + ]; + }) + sources."date-format-3.0.0" sources."debounce-1.2.0" sources."debug-4.2.0" sources."deep-extend-0.6.0" + sources."define-properties-1.1.3" + sources."duplexer2-0.1.4" + sources."end-of-stream-1.4.4" + sources."es-abstract-1.17.6" + sources."es-to-primitive-1.2.1" sources."event-lite-0.1.2" + sources."execa-1.0.0" sources."fast-diff-1.2.0" sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.13.0" sources."fp-ts-2.8.2" sources."fs-extra-8.1.0" - sources."fs-minipass-1.2.7" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" + (sources."fstream-1.0.12" // { + dependencies = [ + sources."mkdirp-0.5.5" + sources."rimraf-2.7.1" + ]; + }) + sources."function-bind-1.1.1" + sources."get-stream-4.1.0" sources."glob-7.1.6" sources."graceful-fs-4.2.4" + sources."has-1.0.3" + sources."has-symbols-1.0.1" + sources."http-proxy-agent-4.0.1" + sources."https-proxy-agent-5.0.0" sources."ieee754-1.1.13" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" sources."int64-buffer-0.1.10" + sources."is-callable-1.2.1" + sources."is-date-object-1.0.2" + sources."is-docker-2.1.1" + sources."is-negative-zero-2.0.0" + sources."is-regex-1.1.1" + sources."is-stream-1.1.0" + sources."is-symbol-1.0.3" + sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isuri-2.0.3" - sources."jsonc-parser-2.3.0" + sources."jsonc-parser-2.3.1" sources."jsonfile-4.0.0" + sources."listenercount-1.0.1" (sources."locate-java-home-1.1.2" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."lodash-4.17.20" - sources."log4js-5.3.0" - (sources."metals-languageclient-0.3.0" // { - dependencies = [ - sources."mkdirp-1.0.4" - sources."semver-7.3.2" - ]; - }) + sources."log4js-6.3.0" + sources."metals-languageclient-0.3.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" + sources."minipass-3.1.3" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."msgpack-lite-0.1.26" (sources."mv-2.1.1" // { dependencies = [ sources."glob-6.0.4" + sources."mkdirp-0.5.5" sources."rimraf-2.4.5" ]; }) sources."ncp-2.0.0" + sources."nice-try-1.0.5" sources."node-fetch-2.6.1" sources."node-int64-0.4.0" + sources."npm-run-path-2.0.2" + sources."object-inspect-1.8.0" + sources."object-keys-1.1.1" + (sources."object.assign-4.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."once-1.4.0" + sources."p-finally-1.0.0" sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."process-nextick-args-2.0.1" + sources."promise.prototype.finally-3.1.2" sources."promisify-child-process-4.1.1" + sources."pump-3.0.0" sources."rc-1.2.8" + sources."readable-stream-2.3.7" sources."rfc-3986-1.0.1" sources."rfdc-1.1.4" sources."rimraf-3.0.2" - sources."safe-buffer-5.2.1" - sources."semver-6.3.0" + sources."safe-buffer-5.1.2" + sources."semver-7.3.2" + sources."setimmediate-1.0.5" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" - sources."streamroller-2.2.4" + sources."signal-exit-3.0.3" + (sources."streamroller-2.2.4" // { + dependencies = [ + sources."date-format-2.1.0" + ]; + }) + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimstart-1.0.1" + sources."string_decoder-1.1.1" + sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."tar-4.4.13" - sources."tslib-1.13.0" - sources."tunnel-0.0.6" + sources."tar-6.0.5" + sources."traverse-0.3.9" + sources."tslib-2.0.1" sources."universalify-0.1.2" - sources."uuid-3.4.0" + sources."unzipper-0.10.11" + sources."util-deprecate-1.0.2" + sources."uuid-7.0.3" sources."vscode-jsonrpc-5.0.1" sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" sources."vscode-uri-2.1.2" - sources."which-1.3.1" + sources."which-2.0.2" sources."wrappy-1.0.2" - sources."yallist-3.1.1" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -57370,7 +58221,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001129" + sources."caniuse-lite-1.0.30001131" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -57467,7 +58318,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.567" + sources."electron-to-chromium-1.3.570" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -57903,7 +58754,7 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" sources."preserve-0.2.0" - sources."prettier-2.1.1" + sources."prettier-2.1.2" (sources."prettier-eslint-10.1.1" // { dependencies = [ sources."prettier-1.19.1" @@ -58046,7 +58897,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."specificity-0.3.2" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" @@ -58266,10 +59117,10 @@ in coc-r-lsp = nodeEnv.buildNodePackage { name = "coc-r-lsp"; packageName = "coc-r-lsp"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-r-lsp/-/coc-r-lsp-1.2.0.tgz"; - sha512 = "+HpMgywqTOkClNI/UD1rpH6WDLmxtKLDVQX3bEmsJNSC70sLcMKhJRh+HUBx0tL2gnNwGYKgUl7uH9rKoPzAbQ=="; + url = "https://registry.npmjs.org/coc-r-lsp/-/coc-r-lsp-1.2.1.tgz"; + sha512 = "SOsCwIuQeE4eiX/Scgs2nL1WnR0JwFZ2/Edh3dx5ijmZSlEPxdc0PnMUN0hT9y96jK5/ZHAByC3qEperpWqPUA=="; }; dependencies = [ sources."vscode-jsonrpc-5.0.1" @@ -58307,10 +59158,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.7.16"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.16.tgz"; - sha512 = "nYF/RznvKMwVXrW5z4k6Wrw13T6ogdF4TraAMp0P4upAHKhJkkA2aWwzCPiyq9wdadsp9/njWvmMTt5klfAI+g=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.8.0.tgz"; + sha512 = "kX/mSezjGZKy1hM3l+qrqLt4sQfS1GvtzwQQ1iqS4s+1YAwViRFLx/E1RFJRElQZ4WPvvRiu+d0OeiGbKQaMAg=="; }; buildInputs = globalBuildInputs; meta = { @@ -58406,7 +59257,7 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -58449,7 +59300,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.14.2" + sources."browserslist-4.14.3" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -58457,7 +59308,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001129" + sources."caniuse-lite-1.0.30001131" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -58517,11 +59368,11 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.567" + sources."electron-to-chromium-1.3.570" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."escalade-3.0.2" + sources."escalade-3.1.0" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."execall-2.0.0" @@ -58738,7 +59589,7 @@ in sources."picomatch-2.2.2" sources."pify-4.0.1" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.32" // { + (sources."postcss-7.0.34" // { dependencies = [ sources."source-map-0.6.1" sources."supports-color-6.1.0" @@ -58830,7 +59681,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."specificity-0.4.1" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" @@ -59062,10 +59913,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.5.6"; + version = "1.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.6.tgz"; - sha512 = "cBpsRAEcm48nSGIigFHzLjpGlYQmkpKwPxbafHihYpe0gRhNDNnkYg1dUfAhFb+Dnho9tt5Fwy3cmwd305aaiw=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.7.tgz"; + sha512 = "VP/xLBnChBWZPrURULJsy5fi9gt+Fsvv5qWXZrLorBsh/14ppnPqfdyyKRuK+mDrxi9gcnSbAwTHOJ4yl5e9ag=="; }; dependencies = [ sources."typescript-3.9.7" @@ -59136,7 +59987,7 @@ in sources."@types/json-schema-7.0.6" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -59602,7 +60453,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json5-2.1.3" - sources."jsonc-parser-2.3.0" + sources."jsonc-parser-2.3.1" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" @@ -59743,7 +60594,7 @@ in sources."posix-character-classes-0.1.1" sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" - sources."prettier-2.1.1" + sources."prettier-2.1.2" (sources."prettier-eslint-11.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -59897,7 +60748,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."stampit-1.2.0" @@ -60006,7 +60857,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."typescript-4.0.2" + sources."typescript-4.0.3" sources."unherit-1.1.3" (sources."unified-7.1.0" // { dependencies = [ @@ -60187,12 +61038,17 @@ in sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" sources."js-yaml-3.14.0" - sources."jsonc-parser-2.3.0" + sources."jsonc-parser-2.3.1" sources."ms-2.0.0" sources."prettier-2.0.5" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.8.3" + (sources."vscode-json-languageservice-3.8.4" // { + dependencies = [ + sources."vscode-languageserver-types-3.16.0-next.2" + sources."vscode-nls-5.0.0" + ]; + }) sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -60223,10 +61079,10 @@ in coc-yank = nodeEnv.buildNodePackage { name = "coc-yank"; packageName = "coc-yank"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.1.4.tgz"; - sha512 = "8qonhyBfipzni6Fbbdm9hOjUIdLtwPGqnVGxA5DV+Kd4ctvD+FiBRuaWnXWf4QqxC8ATHQyTyoSqrvdXdko4PA=="; + url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.1.5.tgz"; + sha512 = "HITJR6Cjah8xJwPBqWFQCj0vAWu29IrPWuEdZBnGo+qqasGoVSjurGnrRrmZZADuMWh/Z+2z4V7J8DoVejs40Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -60780,7 +61636,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."sshpk-1.16.1" sources."statuses-1.5.0" (sources."string-width-2.1.1" // { @@ -60799,7 +61655,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."systeminformation-4.27.3" + sources."systeminformation-4.27.5" sources."term-size-2.2.0" sources."through-2.3.8" sources."tmp-0.2.1" @@ -60886,7 +61742,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -61178,7 +62034,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" (sources."static-extend-0.1.2" // { dependencies = [ @@ -61254,7 +62110,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -62325,7 +63181,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.751.0" + sources."aws-sdk-2.756.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.1" sources."base64-js-1.3.1" @@ -62504,7 +63360,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -62636,7 +63492,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-schema-typed-7.0.3" sources."json5-2.1.3" - sources."keyv-4.0.1" + sources."keyv-4.0.3" sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" sources."locate-path-3.0.0" @@ -62744,7 +63600,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" (sources."stack-utils-2.0.2" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -62818,13 +63674,14 @@ in sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@fluentui/date-time-utilities-7.8.0" - sources."@fluentui/keyboard-key-0.2.11" - sources."@fluentui/react-7.137.1" - sources."@fluentui/react-focus-7.16.0" - sources."@fluentui/react-icons-0.3.0" - sources."@fluentui/react-window-provider-0.3.0" - sources."@fluentui/theme-0.2.0" + sources."@fluentui/date-time-utilities-7.8.1" + sources."@fluentui/dom-utilities-1.1.1" + sources."@fluentui/keyboard-key-0.2.12" + sources."@fluentui/react-7.138.0" + sources."@fluentui/react-focus-7.16.5" + sources."@fluentui/react-icons-0.3.4" + sources."@fluentui/react-window-provider-0.3.3" + sources."@fluentui/theme-0.3.2" (sources."@gulp-sourcemaps/identity-map-1.0.2" // { dependencies = [ sources."normalize-path-2.1.1" @@ -62836,7 +63693,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.90" + sources."@microsoft/load-themed-styles-1.10.93" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -62868,7 +63725,7 @@ in sources."@types/node-14.0.26" sources."@types/pg-7.14.4" sources."@types/pg-types-1.11.5" - sources."@types/qs-6.9.4" + sources."@types/qs-6.9.5" sources."@types/range-parser-1.2.3" sources."@types/request-2.48.5" sources."@types/serve-static-1.13.5" @@ -62877,13 +63734,13 @@ in sources."@types/sqlite3-3.1.6" sources."@types/tough-cookie-4.0.0" sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.9.0" - sources."@uifabric/icons-7.5.0" - sources."@uifabric/merge-styles-7.18.0" - sources."@uifabric/react-hooks-7.13.0" - sources."@uifabric/set-version-7.0.22" - sources."@uifabric/styling-7.16.0" - sources."@uifabric/utilities-7.31.0" + sources."@uifabric/foundation-7.9.5" + sources."@uifabric/icons-7.5.5" + sources."@uifabric/merge-styles-7.19.1" + sources."@uifabric/react-hooks-7.13.4" + sources."@uifabric/set-version-7.0.23" + sources."@uifabric/styling-7.16.5" + sources."@uifabric/utilities-7.32.2" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -63798,7 +64655,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.137.1" + sources."office-ui-fabric-react-7.138.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -64009,7 +64866,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-1.26.10" + sources."sass-1.26.11" sources."sax-1.2.4" sources."scheduler-0.19.1" sources."schema-utils-2.7.1" @@ -64104,7 +64961,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-1.0.1" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" @@ -64809,7 +65666,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."sshpk-1.16.1" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -65004,7 +65861,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."strip-eof-1.0.0" @@ -65934,7 +66791,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" sources."strip-final-newline-2.0.0" @@ -66035,7 +66892,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -66319,7 +67176,7 @@ in sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" sources."oas-linter-3.2.0" - sources."oas-resolver-2.4.4" + sources."oas-resolver-2.5.0" sources."oas-schema-walker-1.1.5" sources."oas-validator-3.4.0" sources."oauth-sign-0.9.0" @@ -66857,7 +67714,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.27.3" + sources."systeminformation-4.27.5" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -67260,7 +68117,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -67657,7 +68514,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -68670,7 +69527,7 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prelude-ls-1.1.2" - sources."prettier-2.1.1" + sources."prettier-2.1.2" sources."process-nextick-args-2.0.1" sources."promise-polyfill-6.1.0" sources."pseudomap-1.0.2" @@ -68707,7 +69564,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."spiro-2.0.0" sources."split-1.0.1" sources."sprintf-js-1.0.3" @@ -68974,7 +69831,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.751.0" // { + (sources."aws-sdk-2.756.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -71047,7 +71904,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -71785,7 +72642,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-1.0.1" sources."split-string-3.1.0" sources."split2-2.2.0" @@ -72959,7 +73816,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.6" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.5" @@ -73121,7 +73978,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.14.2" + sources."browserslist-4.14.3" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.1" @@ -73136,7 +73993,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001129" + sources."caniuse-lite-1.0.30001131" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -73258,7 +74115,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.567" + sources."electron-to-chromium-1.3.570" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -73276,7 +74133,7 @@ in sources."error-ex-1.3.2" sources."es-abstract-1.18.0-next.0" sources."es-to-primitive-1.2.1" - sources."escalade-3.0.2" + sources."escalade-3.1.0" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.3" sources."eslint-visitor-keys-1.3.0" @@ -73674,7 +74531,7 @@ in sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" - sources."regexpu-core-4.7.0" + sources."regexpu-core-4.7.1" sources."regjsgen-0.5.2" (sources."regjsparser-0.6.4" // { dependencies = [ @@ -73786,7 +74643,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -73934,7 +74791,7 @@ in sources."readdirp-2.2.1" ]; }) - (sources."webpack-4.44.1" // { + (sources."webpack-4.44.2" // { dependencies = [ sources."acorn-6.4.1" sources."micromatch-3.1.10" @@ -74469,23 +75326,24 @@ in sha512 = "uCsn3t7bV3jmy8mcgl19wowBq69Xz/Z/WUkazOC9PXvzzb9j5wvfr+qrwB5GtHkLBFIaBVI59HIX+JJ637jVmA=="; }; dependencies = [ - sources."@fluentui/date-time-utilities-7.8.0" - sources."@fluentui/keyboard-key-0.2.11" - sources."@fluentui/react-7.137.1" - sources."@fluentui/react-focus-7.16.0" - sources."@fluentui/react-icons-0.3.0" - sources."@fluentui/react-window-provider-0.3.0" - sources."@fluentui/theme-0.2.0" - sources."@microsoft/load-themed-styles-1.10.90" + sources."@fluentui/date-time-utilities-7.8.1" + sources."@fluentui/dom-utilities-1.1.1" + sources."@fluentui/keyboard-key-0.2.12" + sources."@fluentui/react-7.138.0" + sources."@fluentui/react-focus-7.16.5" + sources."@fluentui/react-icons-0.3.4" + sources."@fluentui/react-window-provider-0.3.3" + sources."@fluentui/theme-0.3.2" + sources."@microsoft/load-themed-styles-1.10.93" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.9.0" - sources."@uifabric/icons-7.5.0" - sources."@uifabric/merge-styles-7.18.0" - sources."@uifabric/react-hooks-7.13.0" - sources."@uifabric/set-version-7.0.22" - sources."@uifabric/styling-7.16.0" - sources."@uifabric/utilities-7.31.0" + sources."@uifabric/foundation-7.9.5" + sources."@uifabric/icons-7.5.5" + sources."@uifabric/merge-styles-7.19.1" + sources."@uifabric/react-hooks-7.13.4" + sources."@uifabric/set-version-7.0.23" + sources."@uifabric/styling-7.16.5" + sources."@uifabric/utilities-7.32.2" sources."accepts-1.3.7" sources."ajv-6.12.5" sources."ansi-escapes-1.4.0" @@ -74611,7 +75469,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.137.1" + sources."office-ui-fabric-react-7.138.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -74710,7 +75568,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.33.0" + sources."swagger-ui-dist-3.34.0" sources."tail-2.0.4" sources."through-2.3.8" sources."tmp-0.0.33" @@ -75031,42 +75889,147 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "2.62.0"; + version = "2.63.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.62.0.tgz"; - sha512 = "fjMziW+anU8VUQCZmNJAb+yN6n9O+gTqKXgHRT7lVYCpSyBzQP9dCVNBu8x+kwAR1rfPuQE15h/BfG5O1WuU/w=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.63.2.tgz"; + sha512 = "H9c4UIuhOG5jl7ZlwuB/D4ac35BbYgiwXi77jTwx2QLy5Gy/UfId6ocFAdV5KYwSY5Yx2aS5txt4uYXm5qAb6w=="; }; dependencies = [ sources."@analytics/cookie-utils-0.2.3" sources."@analytics/core-0.6.2" sources."@analytics/storage-utils-0.2.4" sources."@babel/code-frame-7.10.4" + (sources."@babel/compat-data-7.11.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + (sources."@babel/core-7.11.6" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."@babel/generator-7.11.6" + sources."@babel/helper-annotate-as-pure-7.10.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" + (sources."@babel/helper-compilation-targets-7.10.4" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."@babel/helper-create-class-features-plugin-7.10.5" + sources."@babel/helper-create-regexp-features-plugin-7.10.4" + sources."@babel/helper-define-map-7.10.5" + sources."@babel/helper-explode-assignable-expression-7.11.4" + sources."@babel/helper-function-name-7.10.4" + sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-hoist-variables-7.10.4" + sources."@babel/helper-member-expression-to-functions-7.11.0" + sources."@babel/helper-module-imports-7.10.4" + sources."@babel/helper-module-transforms-7.11.0" + sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-plugin-utils-7.10.4" + sources."@babel/helper-regex-7.10.5" + sources."@babel/helper-remap-async-to-generator-7.11.4" + sources."@babel/helper-replace-supers-7.10.4" + sources."@babel/helper-simple-access-7.10.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" + sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helper-wrap-function-7.10.4" + sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" sources."@babel/parser-7.11.5" - sources."@bugsnag/browser-7.3.4" - sources."@bugsnag/core-7.3.4" + sources."@babel/plugin-proposal-async-generator-functions-7.10.5" + sources."@babel/plugin-proposal-class-properties-7.10.4" + sources."@babel/plugin-proposal-dynamic-import-7.10.4" + sources."@babel/plugin-proposal-export-namespace-from-7.10.4" + sources."@babel/plugin-proposal-json-strings-7.10.4" + sources."@babel/plugin-proposal-logical-assignment-operators-7.11.0" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.10.4" + sources."@babel/plugin-proposal-numeric-separator-7.10.4" + sources."@babel/plugin-proposal-object-rest-spread-7.11.0" + sources."@babel/plugin-proposal-optional-catch-binding-7.10.4" + sources."@babel/plugin-proposal-optional-chaining-7.11.0" + sources."@babel/plugin-proposal-private-methods-7.10.4" + sources."@babel/plugin-proposal-unicode-property-regex-7.10.4" + sources."@babel/plugin-syntax-async-generators-7.8.4" + sources."@babel/plugin-syntax-class-properties-7.10.4" + sources."@babel/plugin-syntax-dynamic-import-7.8.3" + sources."@babel/plugin-syntax-export-namespace-from-7.8.3" + sources."@babel/plugin-syntax-json-strings-7.8.3" + sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" + sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" + sources."@babel/plugin-syntax-numeric-separator-7.10.4" + sources."@babel/plugin-syntax-object-rest-spread-7.8.3" + sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" + sources."@babel/plugin-syntax-optional-chaining-7.8.3" + sources."@babel/plugin-syntax-top-level-await-7.10.4" + sources."@babel/plugin-transform-arrow-functions-7.10.4" + sources."@babel/plugin-transform-async-to-generator-7.10.4" + sources."@babel/plugin-transform-block-scoped-functions-7.10.4" + sources."@babel/plugin-transform-block-scoping-7.11.1" + sources."@babel/plugin-transform-classes-7.10.4" + sources."@babel/plugin-transform-computed-properties-7.10.4" + sources."@babel/plugin-transform-destructuring-7.10.4" + sources."@babel/plugin-transform-dotall-regex-7.10.4" + sources."@babel/plugin-transform-duplicate-keys-7.10.4" + sources."@babel/plugin-transform-exponentiation-operator-7.10.4" + sources."@babel/plugin-transform-for-of-7.10.4" + sources."@babel/plugin-transform-function-name-7.10.4" + sources."@babel/plugin-transform-literals-7.10.4" + sources."@babel/plugin-transform-member-expression-literals-7.10.4" + sources."@babel/plugin-transform-modules-amd-7.10.5" + sources."@babel/plugin-transform-modules-commonjs-7.10.4" + sources."@babel/plugin-transform-modules-systemjs-7.10.5" + sources."@babel/plugin-transform-modules-umd-7.10.4" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.10.4" + sources."@babel/plugin-transform-new-target-7.10.4" + sources."@babel/plugin-transform-object-super-7.10.4" + sources."@babel/plugin-transform-parameters-7.10.5" + sources."@babel/plugin-transform-property-literals-7.10.4" + sources."@babel/plugin-transform-regenerator-7.10.4" + sources."@babel/plugin-transform-reserved-words-7.10.4" + sources."@babel/plugin-transform-shorthand-properties-7.10.4" + sources."@babel/plugin-transform-spread-7.11.0" + sources."@babel/plugin-transform-sticky-regex-7.10.4" + sources."@babel/plugin-transform-template-literals-7.10.5" + sources."@babel/plugin-transform-typeof-symbol-7.10.4" + sources."@babel/plugin-transform-unicode-escapes-7.10.4" + sources."@babel/plugin-transform-unicode-regex-7.10.4" + (sources."@babel/preset-env-7.11.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."@babel/preset-modules-0.1.4" + sources."@babel/runtime-7.11.2" + sources."@babel/template-7.10.4" + sources."@babel/traverse-7.11.5" + sources."@babel/types-7.11.5" + sources."@bugsnag/browser-7.3.5" + sources."@bugsnag/core-7.3.5" sources."@bugsnag/cuid-3.0.0" - sources."@bugsnag/js-7.3.4" - sources."@bugsnag/node-7.3.4" + sources."@bugsnag/js-7.3.5" + sources."@bugsnag/node-7.3.5" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-3.3.5" // { + (sources."@netlify/build-4.0.4" // { dependencies = [ sources."chalk-3.0.0" sources."resolve-2.0.0-next.1" ]; }) - sources."@netlify/cache-utils-1.0.2" - (sources."@netlify/config-2.1.3" // { + sources."@netlify/cache-utils-1.0.3" + (sources."@netlify/config-2.1.5" // { dependencies = [ sources."chalk-3.0.0" ]; }) - sources."@netlify/functions-utils-1.2.8" - (sources."@netlify/git-utils-1.0.1" // { + sources."@netlify/functions-utils-1.2.9" + (sources."@netlify/git-utils-1.0.2" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -75076,7 +76039,8 @@ in ]; }) sources."@netlify/open-api-0.16.0" - sources."@netlify/run-utils-1.0.0" + sources."@netlify/plugin-edge-handlers-1.1.0" + sources."@netlify/run-utils-1.0.1" (sources."@netlify/zip-it-and-ship-it-1.3.12" // { dependencies = [ sources."resolve-2.0.0-next.1" @@ -75223,6 +76187,15 @@ in }) sources."@octokit/rest-16.43.2" sources."@octokit/types-5.5.0" + sources."@rollup/plugin-babel-5.2.1" + (sources."@rollup/plugin-commonjs-15.0.0" // { + dependencies = [ + sources."estree-walker-2.0.1" + ]; + }) + sources."@rollup/plugin-json-4.1.0" + sources."@rollup/plugin-node-resolve-9.0.0" + sources."@rollup/pluginutils-3.1.0" sources."@sindresorhus/is-0.14.0" sources."@sindresorhus/slugify-1.1.0" (sources."@sindresorhus/transliterate-0.1.1" // { @@ -75234,6 +76207,7 @@ in sources."@types/color-name-1.1.1" sources."@types/decompress-4.2.3" sources."@types/download-6.2.4" + sources."@types/estree-0.0.39" sources."@types/glob-7.1.3" sources."@types/got-8.3.5" sources."@types/http-proxy-1.17.4" @@ -75242,9 +76216,10 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/node-fetch-2.5.7" sources."@types/normalize-package-data-2.4.0" + sources."@types/resolve-1.17.1" sources."@types/semver-5.5.0" sources."@types/yargs-13.0.10" sources."@types/yargs-parser-15.0.0" @@ -75302,12 +76277,13 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.751.0" // { + (sources."aws-sdk-2.756.0" // { dependencies = [ sources."buffer-4.9.2" sources."uuid-3.3.2" ]; }) + sources."babel-plugin-dynamic-import-node-2.3.3" sources."backoff-2.5.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -75336,12 +76312,14 @@ in sources."extend-shallow-2.0.1" ]; }) + sources."browserslist-4.14.3" sources."btoa-lite-1.0.0" sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" + sources."builtin-modules-3.1.0" sources."builtins-1.0.3" sources."byline-5.0.0" sources."bytes-3.1.0" @@ -75354,6 +76332,7 @@ in sources."cachedir-2.3.0" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" + sources."caniuse-lite-1.0.30001131" sources."cardinal-2.1.1" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -75424,6 +76403,7 @@ in sources."combined-stream-1.0.8" sources."commander-2.20.3" sources."common-path-prefix-2.0.0" + sources."commondir-1.0.1" sources."component-emitter-1.3.0" (sources."compress-commons-3.0.0" // { dependencies = [ @@ -75445,6 +76425,11 @@ in ]; }) sources."content-type-1.0.4" + (sources."convert-source-map-1.7.0" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."cookie-0.4.1" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" @@ -75456,6 +76441,11 @@ in sources."safe-buffer-5.1.2" ]; }) + (sources."core-js-compat-3.6.5" // { + dependencies = [ + sources."semver-7.0.0" + ]; + }) sources."core-util-is-1.0.2" sources."cp-file-7.0.0" (sources."cpy-8.1.1" // { @@ -75573,6 +76563,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" + sources."electron-to-chromium-1.3.570" sources."elf-tools-1.1.2" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" @@ -75581,8 +76572,9 @@ in sources."envinfo-7.7.3" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" - sources."es-abstract-1.17.6" + sources."es-abstract-1.18.0-next.0" sources."es-to-primitive-1.2.1" + sources."escalade-3.1.0" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" @@ -75594,6 +76586,7 @@ in sources."eslint-visitor-keys-1.3.0" sources."esprima-4.0.1" sources."estraverse-4.3.0" + sources."estree-walker-1.0.1" sources."esutils-2.0.3" sources."etag-1.8.1" sources."eventemitter3-4.0.7" @@ -75709,13 +76702,14 @@ in sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."fuzzy-0.1.3" + sources."gensync-1.0.0-beta.1" sources."get-amd-module-type-3.0.0" sources."get-caller-file-2.0.5" sources."get-port-5.1.1" sources."get-proxy-2.1.0" sources."get-stream-5.2.0" sources."get-value-2.0.6" - (sources."gh-release-fetch-1.0.3" // { + (sources."gh-release-fetch-1.0.4" // { dependencies = [ sources."semver-5.7.1" ]; @@ -75731,6 +76725,7 @@ in sources."glob-to-regexp-0.3.0" sources."global-cache-dir-1.0.1" sources."global-dirs-2.0.1" + sources."globals-11.12.0" (sources."globby-10.0.2" // { dependencies = [ sources."@nodelib/fs.stat-2.0.3" @@ -75844,6 +76839,7 @@ in ]; }) sources."into-stream-3.1.0" + sources."invariant-2.2.4" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" @@ -75861,6 +76857,7 @@ in sources."is-glob-4.0.1" sources."is-installed-globally-0.3.2" sources."is-interactive-1.0.0" + sources."is-module-1.0.0" sources."is-natural-number-4.0.1" sources."is-negative-zero-2.0.0" sources."is-npm-4.0.0" @@ -75875,6 +76872,7 @@ in sources."is-path-inside-3.0.2" sources."is-plain-obj-2.1.0" sources."is-plain-object-2.0.4" + sources."is-reference-1.2.1" sources."is-regex-1.1.1" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" @@ -75895,9 +76893,11 @@ in sources."js-string-escape-1.0.1" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" + sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" + sources."json5-2.1.3" sources."jsonfile-6.0.1" sources."junk-3.1.0" sources."jwt-decode-2.2.0" @@ -75918,6 +76918,7 @@ in ]; }) sources."leven-3.1.0" + sources."levenary-1.1.1" sources."levn-0.3.0" sources."lines-and-columns-1.1.6" (sources."load-json-file-5.3.0" // { @@ -75964,8 +76965,10 @@ in sources."ms-2.1.2" ]; }) + sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" sources."macos-release-2.4.1" + sources."magic-string-0.25.7" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -76029,7 +77032,7 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-4.3.13" // { + (sources."netlify-4.5.1" // { dependencies = [ sources."qs-6.9.4" ]; @@ -76043,6 +77046,7 @@ in sources."netlify-redirector-0.2.0" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" + sources."node-releases-1.1.61" sources."node-source-walk-4.2.0" sources."noop2-2.0.0" (sources."normalize-package-data-2.5.0" // { @@ -76076,12 +77080,12 @@ in sources."object-keys-1.1.1" sources."object-treeify-1.1.28" sources."object-visit-1.0.1" - (sources."object.assign-4.1.1" // { + sources."object.assign-4.1.1" + (sources."object.getownpropertydescriptors-2.1.0" // { dependencies = [ - sources."es-abstract-1.18.0-next.0" + sources."es-abstract-1.17.6" ]; }) - sources."object.getownpropertydescriptors-2.1.0" sources."object.pick-1.3.0" sources."octokit-pagination-methods-1.1.0" sources."omit.js-2.0.2" @@ -76168,7 +77172,7 @@ in sources."pinkie-promise-2.0.1" sources."pkg-dir-4.2.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.32" // { + (sources."postcss-7.0.34" // { dependencies = [ sources."has-flag-3.0.0" sources."source-map-0.6.1" @@ -76215,9 +77219,20 @@ in sources."readable-stream-3.6.0" sources."readdirp-3.4.0" sources."redeyed-2.1.1" + sources."regenerate-1.4.1" + sources."regenerate-unicode-properties-8.2.0" + sources."regenerator-runtime-0.13.7" + sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" + sources."regexpu-core-4.7.1" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" + sources."regjsgen-0.5.2" + (sources."regjsparser-0.6.4" // { + dependencies = [ + sources."jsesc-0.5.0" + ]; + }) sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -76237,6 +77252,7 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" + sources."rollup-2.27.1" sources."run-async-2.4.1" sources."run-parallel-1.1.9" sources."rxjs-6.6.3" @@ -76318,10 +77334,11 @@ in sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" + sources."sourcemap-codec-1.4.8" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."split2-1.1.1" sources."sprintf-js-1.0.3" @@ -76359,8 +77376,16 @@ in sources."statuses-1.5.0" sources."strict-uri-encode-1.1.0" sources."string-width-4.2.0" - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" + (sources."string.prototype.trimend-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) + (sources."string.prototype.trimstart-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -76417,6 +77442,7 @@ in sources."timed-out-4.0.1" sources."tmp-0.0.33" sources."to-buffer-1.1.1" + sources."to-fast-properties-2.0.0" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -76445,6 +77471,10 @@ in sources."typescript-3.9.7" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" + sources."unicode-canonical-property-names-ecmascript-1.0.4" + sources."unicode-match-property-ecmascript-1.0.4" + sources."unicode-match-property-value-ecmascript-1.2.0" + sources."unicode-property-aliases-ecmascript-1.1.0" sources."union-value-1.0.1" sources."uniq-1.0.1" sources."unique-string-2.0.0" @@ -76477,7 +77507,11 @@ in sources."url-to-options-1.0.1" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.1" + (sources."util.promisify-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.6" + ]; + }) sources."utils-merge-1.0.1" sources."uuid-8.3.0" sources."validate-npm-package-license-3.0.4" @@ -76911,7 +77945,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" (sources."sshpk-1.16.1" // { dependencies = [ sources."assert-plus-1.0.0" @@ -77725,7 +78759,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."sshpk-1.16.1" sources."ssri-5.3.0" sources."string-width-1.0.2" @@ -78746,7 +79780,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.14.2" + sources."browserslist-4.14.3" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -78762,7 +79796,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001129" + sources."caniuse-lite-1.0.30001131" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -78896,7 +79930,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.567" + sources."electron-to-chromium-1.3.570" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -78908,7 +79942,7 @@ in sources."error-ex-1.3.2" sources."es-abstract-1.18.0-next.0" sources."es-to-primitive-1.2.1" - sources."escalade-3.0.2" + sources."escalade-3.1.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."escodegen-1.9.1" @@ -79196,7 +80230,7 @@ in sources."physical-cpu-count-2.0.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.32" // { + (sources."postcss-7.0.34" // { dependencies = [ sources."supports-color-6.1.0" ]; @@ -79278,6 +80312,8 @@ in (sources."purgecss-2.3.0" // { dependencies = [ sources."commander-5.1.0" + sources."postcss-7.0.32" + sources."supports-color-6.1.0" ]; }) sources."q-1.5.1" @@ -79304,7 +80340,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."regexpu-core-4.7.0" + sources."regexpu-core-4.7.1" sources."regjsgen-0.5.2" (sources."regjsparser-0.6.4" // { dependencies = [ @@ -79815,6 +80851,274 @@ in bypassCache = true; reconstructLock = true; }; + patch-package = nodeEnv.buildNodePackage { + name = "patch-package"; + packageName = "patch-package"; + version = "6.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/patch-package/-/patch-package-6.2.2.tgz"; + sha512 = "YqScVYkVcClUY0v8fF0kWOjDYopzIM8e3bj/RU1DPeEF14+dCGm6UeOYm4jvCyxqIEQ5/eJzmbWfDWnUleFNMg=="; + }; + dependencies = [ + sources."@yarnpkg/lockfile-1.1.0" + sources."ansi-styles-3.2.1" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."atob-2.1.2" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."cache-base-1.0.1" + sources."chalk-2.4.2" + sources."ci-info-2.0.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."component-emitter-1.3.0" + sources."concat-map-0.0.1" + sources."copy-descriptor-0.1.1" + sources."cross-spawn-6.0.5" + sources."debug-2.6.9" + sources."decode-uri-component-0.2.0" + sources."define-property-2.0.2" + sources."escape-string-regexp-1.0.5" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."find-yarn-workspace-root-1.2.1" // { + dependencies = [ + sources."fs-extra-4.0.3" + ]; + }) + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" + sources."fs-extra-7.0.1" + sources."fs.realpath-1.0.0" + sources."get-value-2.0.6" + sources."glob-7.1.6" + sources."graceful-fs-4.2.4" + sources."has-flag-3.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-accessor-descriptor-1.0.0" + sources."is-buffer-1.1.6" + sources."is-ci-2.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-plain-object-2.0.4" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."jsonfile-4.0.0" + sources."kind-of-6.0.3" + sources."klaw-sync-6.0.0" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."micromatch-3.1.10" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."ms-2.0.0" + sources."nanomatch-1.2.13" + sources."nice-try-1.0.5" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."once-1.4.0" + sources."os-tmpdir-1.0.2" + sources."pascalcase-0.1.1" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."posix-character-classes-0.1.1" + sources."regex-not-1.0.2" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."rimraf-2.7.1" + sources."safe-regex-1.1.0" + sources."semver-5.7.1" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."slash-2.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."supports-color-5.5.0" + sources."tmp-0.0.33" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."union-value-1.0.1" + sources."universalify-0.1.2" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."urix-0.1.0" + sources."use-3.1.1" + sources."which-1.3.1" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Fix broken node modules with no fuss"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; peerflix = nodeEnv.buildNodePackage { name = "peerflix"; packageName = "peerflix"; @@ -80078,7 +81382,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -80519,10 +81823,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.5.13"; + version = "5.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.5.13.tgz"; - sha512 = "dNKfdY4HXOyAEsCzSuFbJ5uSCoabYTavw19YiN4wYuzk3ULG+5+Wc9+eAIm1hdQhD8gBG8etNm2O3/8lYAImdw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.6.1.tgz"; + sha512 = "pHEgIV5hIqwaMqDlDNj5yuNuSjN5CKAZvBgdL5CC2mo2itdpqoYy/NkLId0bnnRgrsmyA57Nz4Q78JFnx0Jcdw=="; }; buildInputs = globalBuildInputs; meta = { @@ -80621,7 +81925,7 @@ in sources."path-type-4.0.0" sources."picomatch-2.2.2" sources."pify-2.3.0" - (sources."postcss-7.0.32" // { + (sources."postcss-7.0.34" // { dependencies = [ sources."ansi-styles-3.2.1" (sources."chalk-2.4.2" // { @@ -80635,7 +81939,7 @@ in sources."supports-color-6.1.0" ]; }) - sources."postcss-load-config-2.1.0" + sources."postcss-load-config-2.1.1" (sources."postcss-reporter-6.0.1" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -80682,10 +81986,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.1.1.tgz"; - sha512 = "9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz"; + sha512 = "16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg=="; }; buildInputs = globalBuildInputs; meta = { @@ -81005,10 +82309,10 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.14.0"; + version = "0.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.14.0.tgz"; - sha512 = "tx8p1CIBNLO8f3Z0+MfiVIBzfKDQh0CykaFnlvWfGMH5Q0JPjF9egR4F4YI6FHXUfRi9tccMSXeIR/ZV423Wnw=="; + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.14.2.tgz"; + sha512 = "4dLL/PvePCi4GvI88OjcT1lERIj4jpspXeUvivkYvGxI2NypkmrADuxa32Y3kIZ0D+bAM2ZR6MyOqAyztmRKcg=="; }; dependencies = [ sources."isexe-2.0.0" @@ -81071,10 +82375,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.71"; + version = "1.1.72"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.71.tgz"; - sha512 = "sWAZenzmMifLHOmWUz+JVWfW+9w65xwI8VYhzrVD+5d/lQeo1bljwGAi/nHdDmyY0jjW7tmEc4TNTsDpaTGPZg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.72.tgz"; + sha512 = "nRYCxhlGwG/NRl6eCZX3oxUaZGy7VRVuL/b46ZsDh69ZzkZ/CSMsxW19Jb4vZgGb8M2eLcFpan45m7UtiHBMWA=="; }; buildInputs = globalBuildInputs; meta = { @@ -81474,7 +82778,7 @@ in sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" sources."oas-linter-3.2.0" - sources."oas-resolver-2.4.4" + sources."oas-resolver-2.5.0" sources."oas-schema-walker-1.1.5" sources."oas-validator-3.4.0" sources."object-assign-4.1.1" @@ -81670,10 +82974,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.26.11"; + version = "2.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.26.11.tgz"; - sha512 = "xyfxxhsE6hW57xhfL1I+ixH8l2bdoIMaAecdQiWF3N7IgJEMu99JG+daBiSZQjnBpzFxa0/xZm+3pbCdAQehHw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.27.1.tgz"; + sha512 = "GiWHQvnmMgBktSpY/1+nrGpwPsTw4b9P28og2uedfeq4JZ16rzAmnQ5Pm/E0/BEmDNia1ZbY7+qu3nBgNa19Hg=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -81973,7 +83277,7 @@ in sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.26.11" + sources."rollup-2.27.1" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."serialize-javascript-4.0.0" @@ -82340,13 +83644,20 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.0.0.tgz"; - sha512 = "VC4VaZ4vDlV7PZ0pknUNCEGAEadr/NkkFjSl2or89tngb5Y2A/Y/vwoCIXOqshR5bT6xIcPZuP7Oq573KeEXLQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.1.1.tgz"; + sha512 = "e9NoM93/1hWm2+5YsfNbZPZuqjD62B2k16j85hTuLoOtkDPjp80vma9he4kMwbJoEoU4cT332vBWg8+EQmdkFA=="; }; dependencies = [ sources."2-thenable-1.0.0" + (sources."@kwsites/file-exists-1.1.1" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) + sources."@kwsites/promise-deferred-1.1.1" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -82360,41 +83671,65 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" - sources."@serverless/cli-1.5.2" + (sources."@serverless/cli-1.5.2" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.1.2" // { + (sources."@serverless/components-3.1.3" // { dependencies = [ + sources."chalk-2.4.2" + sources."fs-extra-8.1.0" sources."globby-10.0.2" - sources."semver-7.3.2" + sources."uuid-3.4.0" ]; }) (sources."@serverless/core-1.1.2" // { dependencies = [ sources."fs-extra-7.0.1" + sources."semver-6.3.0" + ]; + }) + (sources."@serverless/enterprise-plugin-4.0.4" // { + dependencies = [ + sources."@serverless/platform-client-2.0.2" ]; }) - sources."@serverless/enterprise-plugin-4.0.2" sources."@serverless/event-mocks-1.1.1" - sources."@serverless/inquirer-1.1.2" + (sources."@serverless/inquirer-1.1.2" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) sources."@serverless/platform-client-1.1.10" (sources."@serverless/platform-client-china-1.0.37" // { dependencies = [ sources."archiver-4.0.2" sources."async-3.2.0" + sources."fs-extra-8.1.0" ]; }) (sources."@serverless/platform-sdk-2.3.2" // { dependencies = [ + sources."chalk-2.4.2" sources."debug-4.2.0" sources."https-proxy-agent-4.0.0" + sources."is-docker-1.1.0" sources."ms-2.1.2" sources."ramda-0.25.0" + sources."uuid-3.4.0" sources."ws-6.2.1" ]; }) sources."@serverless/template-1.1.3" - sources."@serverless/utils-1.2.0" - sources."@serverless/utils-china-0.1.27" + (sources."@serverless/utils-1.2.0" // { + dependencies = [ + sources."chalk-2.4.2" + sources."uuid-3.4.0" + ]; + }) + sources."@serverless/utils-china-0.1.28" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-0.2.17" @@ -82405,7 +83740,7 @@ in sources."@types/lodash-4.14.161" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/object-assign-4.0.30" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" @@ -82422,29 +83757,19 @@ in }) sources."ansi-escapes-4.3.1" sources."ansi-regex-4.1.0" - (sources."ansi-styles-4.2.1" // { - dependencies = [ - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" (sources."archive-type-4.0.0" // { dependencies = [ sources."file-type-4.4.0" ]; }) - (sources."archiver-3.1.1" // { + (sources."archiver-5.0.2" // { dependencies = [ - (sources."compress-commons-2.1.1" // { - dependencies = [ - sources."readable-stream-2.3.7" - ]; - }) - sources."isarray-1.0.0" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - sources."zip-stream-2.1.3" + sources."async-3.2.0" + sources."compress-commons-4.0.1" + sources."crc32-stream-4.0.0" + sources."zip-stream-4.0.2" ]; }) (sources."archiver-utils-2.1.0" // { @@ -82463,7 +83788,8 @@ in sources."async-2.6.3" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.751.0" // { + sources."at-least-node-1.0.0" + (sources."aws-sdk-2.756.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -82486,11 +83812,16 @@ in (sources."boxen-4.2.0" // { dependencies = [ sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."emoji-regex-8.0.0" + sources."has-flag-4.0.0" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" sources."type-fest-0.8.1" ]; }) @@ -82513,12 +83844,13 @@ in sources."callsite-1.0.0" sources."camelcase-5.3.1" sources."caseless-0.12.0" - sources."caw-2.0.1" - (sources."chalk-2.4.2" // { + (sources."chalk-4.1.0" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" + sources."ansi-styles-4.2.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" ]; }) sources."chardet-0.7.0" @@ -82554,7 +83886,6 @@ in ]; }) sources."concat-map-0.0.1" - sources."config-chain-1.1.12" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -82575,9 +83906,8 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.8.35" + sources."dayjs-1.8.36" sources."debug-3.1.0" - sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" (sources."decompress-4.2.1" // { dependencies = [ @@ -82618,19 +83948,29 @@ in sources."dir-glob-3.0.1" sources."dot-qs-0.2.0" sources."dotenv-8.2.0" - (sources."download-7.1.0" // { + (sources."download-8.0.0" // { dependencies = [ sources."@sindresorhus/is-0.7.0" - sources."cacheable-request-2.1.4" - sources."file-type-8.1.0" - sources."get-stream-3.0.0" - sources."got-8.3.2" + (sources."cacheable-request-2.1.4" // { + dependencies = [ + sources."get-stream-3.0.0" + ]; + }) + sources."file-type-11.1.0" + (sources."got-8.3.2" // { + dependencies = [ + sources."get-stream-3.0.0" + sources."pify-3.0.0" + ]; + }) sources."http-cache-semantics-3.8.1" sources."keyv-3.0.0" sources."lowercase-keys-1.0.0" + sources."make-dir-2.1.0" sources."normalize-url-2.0.1" sources."p-cancelable-0.4.1" - sources."pify-3.0.0" + sources."pify-4.0.1" + sources."semver-5.7.1" sources."sort-keys-2.0.0" ]; }) @@ -82676,19 +84016,20 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.7" + sources."fastest-levenshtein-1.0.12" sources."fastq-1.8.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.0" sources."figures-3.2.0" sources."file-type-5.2.0" sources."filename-reserved-regex-2.0.0" - sources."filenamify-2.1.0" - sources."filesize-3.6.1" + sources."filenamify-3.0.0" + sources."filesize-6.1.0" sources."fill-range-7.0.1" (sources."find-process-1.4.3" // { dependencies = [ + sources."chalk-2.4.2" sources."debug-2.6.9" ]; }) @@ -82707,13 +84048,17 @@ in ]; }) sources."fs-constants-1.0.0" - sources."fs-extra-8.1.0" + (sources."fs-extra-9.0.1" // { + dependencies = [ + sources."jsonfile-6.0.1" + sources."universalify-1.0.0" + ]; + }) sources."fs.realpath-1.0.0" sources."fs2-0.3.8" sources."fsevents-2.1.3" sources."function-bind-1.1.1" - sources."get-proxy-2.1.0" - sources."get-stdin-6.0.0" + sources."get-stdin-8.0.0" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -82726,7 +84071,7 @@ in sources."har-validator-5.1.5" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" - sources."has-flag-4.0.0" + sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."http-cache-semantics-4.1.0" @@ -82750,18 +84095,15 @@ in (sources."inquirer-6.5.2" // { dependencies = [ sources."ansi-escapes-3.2.0" + sources."chalk-2.4.2" sources."figures-2.0.0" ]; }) - (sources."inquirer-autocomplete-prompt-1.1.0" // { - dependencies = [ - sources."chalk-4.1.0" - ]; - }) + sources."inquirer-autocomplete-prompt-1.1.0" sources."into-stream-3.1.0" sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" - sources."is-docker-1.1.0" + sources."is-docker-2.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -82773,11 +84115,7 @@ in sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" - (sources."is-wsl-2.2.0" // { - dependencies = [ - sources."is-docker-2.1.1" - ]; - }) + sources."is-wsl-2.2.0" sources."isarray-2.0.1" sources."isexe-2.0.0" sources."isomorphic-ws-4.0.1" @@ -82866,11 +84204,6 @@ in sources."node-fetch-2.6.1" sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" - (sources."npm-conf-1.1.3" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-component-0.0.3" @@ -82879,11 +84212,7 @@ in sources."once-1.4.0" sources."one-time-0.0.4" sources."onetime-2.0.1" - (sources."open-7.2.1" // { - dependencies = [ - sources."is-docker-2.1.1" - ]; - }) + sources."open-7.2.1" (sources."opn-5.5.0" // { dependencies = [ sources."is-wsl-1.1.0" @@ -82894,10 +84223,14 @@ in sources."p-event-2.3.1" sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" - sources."p-limit-2.3.0" + sources."p-limit-3.0.2" sources."p-timeout-2.0.1" sources."p-try-2.2.0" - sources."package-json-6.5.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."pako-1.0.11" sources."parseqs-0.0.5" sources."parseuri-0.0.5" @@ -82915,10 +84248,9 @@ in sources."prettyoutput-1.2.0" sources."process-nextick-args-2.0.1" sources."promise-queue-2.2.5" - sources."proto-list-1.2.4" (sources."protobufjs-6.10.1" // { dependencies = [ - sources."@types/node-13.13.19" + sources."@types/node-13.13.21" ]; }) sources."psl-1.8.0" @@ -82930,6 +84262,7 @@ in sources."ramda-0.26.1" sources."rc-1.2.8" sources."readable-stream-3.6.0" + sources."readdir-glob-1.0.0" sources."readdirp-3.4.0" sources."regenerator-runtime-0.13.7" sources."registry-auth-token-4.2.0" @@ -82938,6 +84271,7 @@ in (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" + sources."uuid-3.4.0" ]; }) sources."request-promise-core-1.1.4" @@ -82952,14 +84286,13 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."seek-bzip-1.0.6" - sources."semver-6.3.0" - sources."semver-regex-2.0.0" + sources."semver-7.3.2" sources."set-immediate-shim-1.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shortid-2.2.15" sources."signal-exit-3.0.3" - (sources."simple-git-1.132.0" // { + (sources."simple-git-2.20.1" // { dependencies = [ sources."debug-4.2.0" sources."ms-2.1.2" @@ -83008,11 +84341,12 @@ in sources."string_decoder-1.1.1" ]; }) - sources."supports-color-7.2.0" + sources."supports-color-5.5.0" (sources."tabtab-3.0.2" // { dependencies = [ sources."debug-4.2.0" sources."ms-2.1.2" + sources."untildify-3.0.3" ]; }) sources."tar-stream-2.1.4" @@ -83037,7 +84371,7 @@ in sources."type-fest-0.11.0" sources."unbzip2-stream-1.4.3" sources."universalify-0.1.2" - sources."untildify-3.0.3" + sources."untildify-4.0.0" sources."uri-js-4.4.0" (sources."url-0.10.3" // { dependencies = [ @@ -83048,7 +84382,7 @@ in sources."url-to-options-1.0.1" sources."urlencode-1.1.0" sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" + sources."uuid-8.3.0" sources."verror-1.10.0" sources."which-1.3.1" (sources."widest-line-3.1.0" // { @@ -83078,7 +84412,7 @@ in sources."xtend-4.0.2" sources."yaml-ast-parser-0.0.43" sources."yamljs-0.3.0" - sources."yargs-parser-18.1.3" + sources."yargs-parser-20.0.0" sources."yauzl-2.10.0" sources."yeast-0.1.2" sources."zip-stream-3.0.1" @@ -83720,10 +85054,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.393.1"; + version = "1.398.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.393.1.tgz"; - sha512 = "PHUjMJAZGz39vVpYFNlP1pgrJJ6j7fIxeBkwB80ijrds43pyj/WCxvF9ydNbP/vbAT9znHWHg6z+dSK3SEhTzw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.398.1.tgz"; + sha512 = "jH24ztdJY8DQlqkd1z8n/JutdOqHtTPccCynM2hfOedW20yAp9c108LFjXvqBEk/EH3YyNmWzyLkkHOySeDkwQ=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -83754,7 +85088,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.5" sources."@types/keyv-3.1.1" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" sources."@yarnpkg/lockfile-1.1.0" @@ -83980,7 +85314,7 @@ in sources."pako-1.0.11" ]; }) - sources."keyv-4.0.1" + sources."keyv-4.0.3" sources."latest-version-5.1.0" sources."lcid-1.0.0" sources."levn-0.3.0" @@ -84106,7 +85440,7 @@ in sources."signal-exit-3.0.3" sources."smart-buffer-4.1.0" sources."snyk-config-3.1.1" - (sources."snyk-cpp-plugin-1.4.3" // { + (sources."snyk-cpp-plugin-1.5.0" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -84117,7 +85451,7 @@ in sources."tslib-2.0.1" ]; }) - (sources."snyk-docker-plugin-3.20.0" // { + (sources."snyk-docker-plugin-3.21.0" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -84172,7 +85506,7 @@ in }) (sources."snyk-policy-1.14.1" // { dependencies = [ - sources."@types/node-6.14.11" + sources."@types/node-6.14.12" sources."hosted-git-info-2.8.8" (sources."snyk-module-2.1.0" // { dependencies = [ @@ -84189,7 +85523,7 @@ in }) (sources."snyk-resolve-deps-4.4.0" // { dependencies = [ - sources."@types/node-6.14.11" + sources."@types/node-6.14.12" sources."debug-3.2.6" sources."hosted-git-info-2.8.8" sources."lru-cache-4.1.5" @@ -84529,7 +85863,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."speedtest-net-1.6.2" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -85313,7 +86647,11 @@ in ]; }) sources."string-width-1.0.2" - sources."string.prototype.trim-1.2.1" + (sources."string.prototype.trim-1.2.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.1.1" @@ -85486,7 +86824,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.751.0" // { + (sources."aws-sdk-2.756.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -86040,7 +87378,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-1.0.1" sources."sprintf-js-1.0.3" (sources."sshpk-1.16.1" // { @@ -87308,7 +88646,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."sprintf-js-1.0.3" sources."state-toggle-1.0.3" (sources."string-width-1.0.2" // { @@ -87700,7 +89038,7 @@ in sources."rehype-parse-7.0.1" sources."rehype-retext-2.0.4" sources."remark-frontmatter-2.0.0" - sources."remark-mdx-2.0.0-next.7" + sources."remark-mdx-2.0.0-next.8" sources."remark-message-control-6.0.0" (sources."remark-parse-8.0.3" // { dependencies = [ @@ -87737,7 +89075,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -88261,7 +89599,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.0" @@ -88469,7 +89807,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.0.1" + sources."keyv-4.0.3" sources."ldap-filter-0.3.3" sources."ldapjs-2.1.1" sources."linkify-it-3.0.2" @@ -88728,10 +90066,10 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "5.2.3"; + version = "5.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.2.3.tgz"; - sha512 = "7oXVf/Qr68U00Cv+CzaFjxuPnuwewXyDS3jsI5bPcH75vvUQfjRqrWcKvCm3pl9MX7Rd4ZMtelDVbYKtxxkyWw=="; + url = "https://registry.npmjs.org/titanium/-/titanium-5.2.5.tgz"; + sha512 = "P2+0coxeYre+1Lf/k2t61W1UwcNhupQy5s5UcpDkbGiRg7EDoYVnkix1H08yg+mfKh14Jm9+6QDDKpEWM+arZQ=="; }; dependencies = [ sources."adm-zip-0.4.13" @@ -88794,7 +90132,7 @@ in sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."moment-2.28.0" - (sources."node-appc-1.1.0" // { + (sources."node-appc-1.1.1" // { dependencies = [ sources."async-3.2.0" sources."colors-1.4.0" @@ -89060,7 +90398,7 @@ in sha512 = "N8E1X543CWEjg0/A70ZnA/kfAfAY/uogILsIuWBhHGxzv9kaJaj7/JCSwDiBH86CPEy37chSgW86KxVeYKsswQ=="; }; dependencies = [ - sources."@types/node-6.14.11" + sources."@types/node-6.14.12" sources."ansi-0.3.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -89126,10 +90464,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz"; - sha512 = "e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz"; + sha512 = "tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="; }; buildInputs = globalBuildInputs; meta = { @@ -89209,7 +90547,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -89520,6 +90858,253 @@ in bypassCache = true; reconstructLock = true; }; + vega-cli = nodeEnv.buildNodePackage { + name = "vega-cli"; + packageName = "vega-cli"; + version = "5.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.15.0.tgz"; + sha512 = "1Mv7+T84L6EIPIsC3fslhywNDfguy135EN4uAcFCWhErQXG3yzel2gNyvlsA0ixTAi5oG7mFL6ftkTB6r2CzIw=="; + }; + dependencies = [ + sources."@types/color-name-1.1.1" + sources."abbrev-1.1.1" + sources."ansi-regex-2.1.1" + sources."ansi-styles-4.2.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."camelcase-5.3.1" + sources."canvas-2.6.1" + sources."chownr-1.1.4" + (sources."cliui-6.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) + sources."code-point-at-1.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-2.20.3" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."d3-array-2.7.1" + sources."d3-color-2.0.0" + sources."d3-delaunay-5.3.0" + sources."d3-dispatch-2.0.0" + sources."d3-dsv-2.0.0" + sources."d3-force-2.1.1" + sources."d3-format-2.0.0" + sources."d3-geo-2.0.1" + sources."d3-geo-projection-3.0.0" + sources."d3-hierarchy-2.0.0" + sources."d3-interpolate-2.0.1" + sources."d3-path-2.0.0" + sources."d3-quadtree-2.0.0" + sources."d3-scale-3.2.2" + sources."d3-shape-2.0.0" + sources."d3-time-2.0.0" + sources."d3-time-format-3.0.0" + sources."d3-timer-2.0.0" + sources."debug-3.2.6" + sources."decamelize-1.2.0" + sources."decompress-response-4.2.1" + sources."deep-extend-0.6.0" + sources."delaunator-4.0.1" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."emoji-regex-8.0.0" + sources."find-up-4.1.0" + sources."fs-minipass-1.2.7" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."get-caller-file-2.0.5" + sources."glob-7.1.6" + sources."has-unicode-2.0.1" + sources."iconv-lite-0.4.24" + sources."ignore-walk-3.0.3" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."is-fullwidth-code-point-1.0.0" + sources."isarray-1.0.0" + sources."locate-path-5.0.0" + sources."mimic-response-2.1.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mkdirp-0.5.5" + sources."ms-2.1.2" + sources."nan-2.14.1" + sources."needle-2.5.2" + sources."node-fetch-2.6.1" + sources."node-pre-gyp-0.11.0" + sources."nopt-4.0.3" + sources."npm-bundled-1.1.1" + sources."npm-normalize-package-bin-1.0.1" + sources."npm-packlist-1.4.8" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" + sources."process-nextick-args-2.0.1" + sources."rc-1.2.8" + sources."readable-stream-2.3.7" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."resolve-1.17.0" + sources."rimraf-2.7.1" + sources."rw-1.3.3" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.7.1" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.3" + sources."simple-concat-1.0.1" + sources."simple-get-3.1.0" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."tar-4.4.13" + sources."topojson-client-3.1.0" + sources."util-deprecate-1.0.2" + sources."vega-5.15.0" + sources."vega-canvas-1.2.4" + sources."vega-crossfilter-4.0.4" + sources."vega-dataflow-5.7.2" + sources."vega-encode-4.8.2" + sources."vega-event-selector-2.0.5" + sources."vega-expression-2.7.0" + sources."vega-force-4.0.6" + sources."vega-format-1.0.3" + sources."vega-functions-5.7.3" + sources."vega-geo-4.3.6" + sources."vega-hierarchy-4.0.8" + sources."vega-loader-4.3.2" + sources."vega-parser-6.0.4" + sources."vega-projection-1.4.4" + sources."vega-regression-1.0.8" + sources."vega-runtime-6.1.2" + sources."vega-scale-7.1.0" + sources."vega-scenegraph-4.9.1" + sources."vega-selections-5.1.3" + sources."vega-statistics-1.7.8" + sources."vega-time-2.0.3" + sources."vega-transforms-4.9.2" + sources."vega-typings-0.18.2" + sources."vega-util-1.15.1" + sources."vega-view-5.8.2" + sources."vega-view-transforms-4.5.7" + sources."vega-voronoi-4.1.4" + sources."vega-wordcloud-4.1.2" + sources."which-module-2.0.0" + sources."wide-align-1.1.3" + (sources."wrap-ansi-6.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) + sources."wrappy-1.0.2" + sources."y18n-4.0.0" + sources."yallist-3.1.1" + (sources."yargs-15.4.1" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) + sources."yargs-parser-18.1.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Command line utilities for server-side Vega."; + homepage = "https://github.com/vega/vega#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + vega-lite = nodeEnv.buildNodePackage { + name = "vega-lite"; + packageName = "vega-lite"; + version = "4.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-lite/-/vega-lite-4.15.0.tgz"; + sha512 = "381Kszxei5Rhg8WkcUE7yPHafLndBbdR8nBSJi4zFsn8iAfCVjn7h7QL9DphNix5V7Ko1nhOadxqNaxGsiD71w=="; + }; + dependencies = [ + sources."@types/clone-2.1.0" + sources."@types/color-name-1.1.1" + sources."@types/fast-json-stable-stringify-2.0.0" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."array-flat-polyfill-1.0.1" + sources."camelcase-5.3.1" + sources."cliui-6.0.0" + sources."clone-2.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."decamelize-1.2.0" + sources."emoji-regex-8.0.0" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."find-up-4.1.0" + sources."get-caller-file-2.0.5" + sources."is-fullwidth-code-point-3.0.0" + sources."json-stringify-pretty-compact-2.0.0" + sources."locate-path-5.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."path-exists-4.0.0" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."set-blocking-2.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."tslib-2.0.1" + sources."vega-event-selector-2.0.5" + sources."vega-expression-2.7.0" + sources."vega-util-1.15.1" + sources."which-module-2.0.0" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.0" + sources."yargs-15.4.1" + sources."yargs-parser-18.1.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Vega-Lite is a concise high-level language for interactive visualization."; + homepage = https://vega.github.io/vega-lite/; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; vim-language-server = nodeEnv.buildNodePackage { name = "vim-language-server"; packageName = "vim-language-server"; @@ -89626,10 +91211,10 @@ in sources."vscode-nls-4.1.2" ]; }) - (sources."vscode-json-languageservice-3.8.3" // { + (sources."vscode-json-languageservice-3.8.4" // { dependencies = [ - sources."jsonc-parser-2.3.0" - sources."vscode-nls-4.1.2" + sources."jsonc-parser-2.3.1" + sources."vscode-nls-5.0.0" sources."vscode-uri-2.1.2" ]; }) @@ -89641,7 +91226,7 @@ in ]; }) sources."vscode-languageserver-textdocument-1.0.1" - sources."vscode-languageserver-types-3.15.1" + sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-nls-2.0.2" sources."vscode-uri-1.0.8" ]; @@ -89967,7 +91552,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -90655,7 +92240,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."stampit-1.2.0" @@ -90832,7 +92417,7 @@ in }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" - (sources."vscode-css-languageservice-4.3.3" // { + (sources."vscode-css-languageservice-4.3.4" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-uri-2.1.2" @@ -90844,7 +92429,7 @@ in sources."vscode-languageserver-protocol-3.15.3" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" - sources."vscode-nls-4.1.2" + sources."vscode-nls-5.0.0" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" (sources."vue-eslint-parser-6.0.5" // { @@ -90922,7 +92507,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."JSONSelect-0.2.1" sources."acorn-7.4.0" sources."acorn-jsx-5.3.1" @@ -91879,10 +93464,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.44.1"; + version = "4.44.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz"; - sha512 = "4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz"; + sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q=="; }; dependencies = [ sources."@webassemblyjs/ast-1.9.0" @@ -92729,7 +94314,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."accepts-1.3.7" sources."ajv-6.12.5" sources."ajv-errors-1.0.1" @@ -93026,7 +94611,7 @@ in sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."nice-try-1.0.5" - sources."node-forge-0.9.0" + sources."node-forge-0.10.0" sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" @@ -93123,7 +94708,7 @@ in sources."safer-buffer-2.1.2" sources."schema-utils-1.0.0" sources."select-hose-2.0.0" - sources."selfsigned-1.10.7" + sources."selfsigned-1.10.8" sources."semver-6.3.0" (sources."send-0.17.1" // { dependencies = [ @@ -93313,10 +94898,10 @@ in copy-webpack-plugin = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.1.0.tgz"; - sha512 = "aWjIuLt1OVQxaDVffnt3bnGmLA8zGgAJaFwPA+a+QYVPh1vhIKjVfh3SbOFLV0kRPvGBITbw17n5CsmiBS4LQQ=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.1.1.tgz"; + sha512 = "4TlkHFYkrZ3WppLA5XkPmBLI5lnEpFsXvpeqxCf5PzkratZiVklNXsvoQkLhUU43q7ZL3AOXtaHAd9jLNJoU0w=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" @@ -93400,7 +94985,7 @@ in sources."safe-buffer-5.2.1" sources."schema-utils-2.7.1" sources."semver-6.3.0" - sources."serialize-javascript-4.0.0" + sources."serialize-javascript-5.0.1" sources."slash-3.0.0" sources."source-list-map-2.0.1" sources."source-map-0.6.1" @@ -93444,7 +95029,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.19" + sources."@types/node-13.13.21" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -93772,10 +95357,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.10.1"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.10.1.tgz"; - sha512 = "R9SEt/nWTuZ8weB040L7yyaIVARlZ0ian1Kv6ptu4+xyVlIMobTZXaBTtgyhlMWqcQ3BpsAZu4q/2plRVG3tLQ=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.11.0.tgz"; + sha512 = "tAEVZvlNLhmF2NLzhOm6UnejjPUp/iiEdxDLdP1Cm3M2YOJ7QLwrYtr0lzoNLLxQkzJwXmuBX01idECTWln82g=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -93787,12 +95372,17 @@ in sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" sources."js-yaml-3.14.0" - sources."jsonc-parser-2.3.0" + sources."jsonc-parser-2.3.1" sources."ms-2.0.0" sources."prettier-2.0.5" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.8.3" + (sources."vscode-json-languageservice-3.8.4" // { + dependencies = [ + sources."vscode-languageserver-types-3.16.0-next.2" + sources."vscode-nls-5.0.0" + ]; + }) sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -93856,7 +95446,7 @@ in sources."@types/color-name-1.1.1" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.10.1" + sources."@types/node-14.11.1" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" @@ -94451,7 +96041,7 @@ in sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."rimraf-2.7.1" - sources."roarr-2.15.3" + sources."roarr-2.15.4" sources."root-check-1.0.0" sources."run-async-2.4.1" sources."rx-4.1.0" @@ -94519,7 +96109,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-string-3.1.0" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 5d960b5e92e8e..a887b65a8f9c1 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -1,20 +1,20 @@ { stdenv, buildPythonPackage, fetchPypi, pythonOlder, python , fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens , brotli, fontmath, mutatormath, booleanoperations -, ufoprocessor, ufonormalizer, psautohint +, ufoprocessor, ufonormalizer, psautohint, tqdm , setuptools_scm , pytest }: buildPythonPackage rec { pname = "afdko"; - version = "3.5.0"; + version = "3.5.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0wid4l70bxm297xgayyrgw5glhp6n92gh4sz1nd4rncgf1ziz8ck"; + sha256 = "1qg7dgl81yq0sp50pkhgvmf8az1svx20zmpkfa68ka9d0ssh1wjw"; }; nativeBuildInputs = [ setuptools_scm ]; @@ -35,6 +35,7 @@ buildPythonPackage rec { ufoprocessor ufonormalizer psautohint + tqdm ]; # tests are broken on non x86_64 diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index cd7a9cd526bbe..08516d05f002d 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy }: +{ stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }: buildPythonPackage rec { pname = "agate-sql"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7"; }; - propagatedBuildInputs = [ agate sqlalchemy ]; + propagatedBuildInputs = [ agate sqlalchemy crate ]; meta = with stdenv.lib; { description = "Adds SQL read/write support to agate."; diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index ea7af2dfeaa65..26cd6441ba5a0 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , buildPythonApplication, python -, mock, pathpy, pyhamcrest, pytest, pytest-html +, pytestCheckHook, mock, pathpy, pyhamcrest, pytest-html , glibcLocales , colorama, cucumber-tag-expressions, parse, parse-type, six }: @@ -16,7 +16,7 @@ buildPythonApplication rec { sha256 = "1ssgixmqlg8sxsyalr83a1970njc2wg3zl8idsmxnsljwacv7qwv"; }; - checkInputs = [ mock pathpy pyhamcrest pytest pytest-html ]; + checkInputs = [ pytestCheckHook mock pathpy pyhamcrest pytest-html ]; buildInputs = [ glibcLocales ]; propagatedBuildInputs = [ colorama cucumber-tag-expressions parse parse-type six ]; @@ -24,14 +24,14 @@ buildPythonApplication rec { patchShebangs bin ''; - doCheck = true; + # timing-based test flaky on Darwin + # https://github.com/NixOS/nixpkgs/pull/97737#issuecomment-691489824 + disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_step_decorator_async_run_until_complete" ]; - checkPhase = '' + postCheck = '' export LANG="en_US.UTF-8" export LC_ALL="en_US.UTF-8" - pytest tests - ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' features/ ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' tools/test-features/ ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' issue.features/ diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index c01f27608fdfa..f41aa6985da96 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "cartopy"; - version = "0.17.0"; + version = "0.18.0"; src = fetchPypi { inherit version; pname = "Cartopy"; - sha256 = "0q9ckfi37cxj7jwnqnzij62vwcf4krccx576vv5lhvpgvplxjjs2"; + sha256 = "0d24fk0cbp29gmkysrwq05vry13swmwi3vx3cpcy04c0ixz33ykz"; }; checkInputs = [ filelock mock pytest_4 pep8 ]; diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index f18e307c61c78..b79bf76131778 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -1,28 +1,34 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder -, pyyaml -, six -, requests , aws-sam-translator , importlib-metadata , importlib-resources , jsonpatch , jsonschema -, pathlib2 -, setuptools , junit-xml , networkx +, pathlib2 +, pyyaml +, requests +, setuptools +, six +# Test inputs +, pytestCheckHook +, mock +, pydot }: buildPythonPackage rec { pname = "cfn-lint"; - version = "0.35.0"; + version = "0.35.1"; - src = fetchPypi { - inherit pname version; - sha256 = "42023d89520e3a29891ec2eb4c326eef9d1f7516fe9abee8b6c97ce064187b45"; + src = fetchFromGitHub { + owner = "aws-cloudformation"; + repo = "cfn-python-lint"; + rev = "v${version}"; + sha256 = "1ajb0412hw9fg9m4b3xbpfbp8cixmnpjxrkaks6k749xinzsv7qk"; }; postPatch = '' @@ -30,20 +36,18 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - pyyaml - six - requests aws-sam-translator jsonpatch jsonschema - pathlib2 - setuptools junit-xml networkx + pathlib2 + pyyaml + requests + setuptools + six ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata importlib-resources ]; - # No tests included in archive - doCheck = false; pythonImportsCheck = [ "cfnlint" "cfnlint.conditions" @@ -60,9 +64,13 @@ buildPythonPackage rec { "cfnlint.transform" ]; + checkInputs = [ pytestCheckHook mock pydot ]; + preCheck = "export PATH=$out/bin:$PATH"; + meta = with lib; { description = "Checks cloudformation for practices and behaviour that could potentially be improved"; homepage = "https://github.com/aws-cloudformation/cfn-python-lint"; + changelog = "https://github.com/aws-cloudformation/cfn-python-lint/blob/master/CHANGELOG.md"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix new file mode 100644 index 0000000000000..42236b4d7c225 --- /dev/null +++ b/pkgs/development/python-modules/crate/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, urllib3 +, isPy3k +, mock +, sqlalchemy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "crate"; + version = "0.24.0"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "028q9r1qyqkq185awkazhplfy7y1081963fnjzi3kf3lxvz6yhay"; + }; + + propagatedBuildInputs = [ + urllib3 + ]; + + checkInputs = [ + pytestCheckHook + sqlalchemy + mock + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/crate/crate-python"; + description = "A Python client library for CrateDB"; + license = licenses.asl20; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index c839dea3d1a64..ea6dfe32fda91 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -13,6 +13,13 @@ buildPythonPackage rec { pname = "duckdb"; inherit (duckdb) version src; + # build attempts to use git to figure out its own version. don't want to add + # the dependency for something pointless. + postPatch = '' + substituteInPlace scripts/package_build.py --replace \ + "'git'" "'false'" + ''; + postConfigure = '' cd tools/pythonpkg export SETUPTOOLS_SCM_PRETEND_VERSION=${version} diff --git a/pkgs/development/python-modules/fluent-logger/default.nix b/pkgs/development/python-modules/fluent-logger/default.nix index e99ececc24e11..70c9173f4d50b 100644 --- a/pkgs/development/python-modules/fluent-logger/default.nix +++ b/pkgs/development/python-modules/fluent-logger/default.nix @@ -9,10 +9,21 @@ buildPythonPackage rec { sha256 = "a7d47eae4d2a11c8cb0df10ae3d034d95b0b8cef9d060e59e7519ad1f82ffa73"; }; + prePatch = '' + substituteInPlace setup.py \ + --replace "msgpack<1.0.0" "msgpack" + ''; + propagatedBuildInputs = [ msgpack ]; # Tests fail because absent in package doCheck = false; + pythonImportsCheck = [ + "fluent" + "fluent.event" + "fluent.handler" + "fluent.sender" + ]; meta = with lib; { description = "A structured logger for Fluentd (Python)"; diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index 6f52eb392a5c2..916812f153547 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -21,9 +21,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ boltons attrs face ]; checkInputs = [ pytest pyyaml ]; - checkPhase = "pytest glom/test"; - - doCheck = !isPy37; # https://github.com/mahmoud/glom/issues/72 + # test_cli.py checks the output of running "glom" + checkPhase = "PATH=$out/bin:$PATH pytest glom/test"; meta = with stdenv.lib; { homepage = "https://github.com/mahmoud/glom"; diff --git a/pkgs/development/python-modules/graspy/default.nix b/pkgs/development/python-modules/graspy/default.nix index 2a7fab12fa216..0281e6a97341e 100644 --- a/pkgs/development/python-modules/graspy/default.nix +++ b/pkgs/development/python-modules/graspy/default.nix @@ -2,8 +2,9 @@ , buildPythonPackage , isPy27 , fetchFromGitHub -, pytest +, pytestCheckHook , pytestcov +, hyppo , matplotlib , networkx , numpy @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "graspy"; - version = "0.2"; + version = "0.3"; disabled = isPy27; @@ -22,10 +23,11 @@ buildPythonPackage rec { owner = "neurodata"; repo = pname; rev = "v${version}"; - sha256 = "1ss7d71lwblimg7ri88ir9w59j0ri13wl75091hjf7q0mchqr6yd"; + sha256 = "0lab76qiryxvwl6zrcikhnxil1xywl0wkkm2vzi4v9mdzpa7w29r"; }; propagatedBuildInputs = [ + hyppo matplotlib networkx numpy @@ -34,14 +36,9 @@ buildPythonPackage rec { seaborn ]; - checkInputs = [ pytest pytestcov ]; - - checkPhase = '' - runHook preCheck - # `test_autogmm` takes too long; fixed in next release (graspy/pull/328) - pytest tests -k 'not test_autogmm' - runHook postCheck - ''; + checkInputs = [ pytestCheckHook pytestcov ]; + pytestFlagsArray = [ "tests" "--ignore=docs" ]; + disabledTests = [ "gridplot_outputs" ]; meta = with lib; { homepage = "https://graspy.neurodata.io"; diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 94a440bb4f100..c60acb2d1f161 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio }: +{ stdenv, buildPythonPackage, fetchPypi, protobuf, grpcio, setuptools }: buildPythonPackage rec { pname = "grpcio-tools"; @@ -11,7 +11,7 @@ buildPythonPackage rec { enableParallelBuilding = true; - propagatedBuildInputs = [ protobuf grpcio ]; + propagatedBuildInputs = [ protobuf grpcio setuptools ]; # no tests in the package doCheck = false; diff --git a/pkgs/development/python-modules/gsd/1.7.nix b/pkgs/development/python-modules/gsd/1.7.nix index c9b3078cd46e6..6e6f0504aa722 100644 --- a/pkgs/development/python-modules/gsd/1.7.nix +++ b/pkgs/development/python-modules/gsd/1.7.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.9.3"; + version = "1.7.0"; pname = "gsd"; src = fetchPypi { inherit pname version; - sha256 = "c6b37344e69020f69fda2b8d97f894cb41fd720840abeda682edd680d1cff838"; + sha256 = "0fpk69wachyydpk9cbs901m7hkwrrvq24ykxsrz62km9ql8lr2vp"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix index 2937b876dec42..ccf1627d7f32f 100644 --- a/pkgs/development/python-modules/gumath/default.nix +++ b/pkgs/development/python-modules/gumath/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage +{ stdenv +, buildPythonPackage +, python , numba , ndtypes , xnd @@ -25,4 +27,20 @@ buildPythonPackage { --replace 'add_runtime_library_dirs = ["$ORIGIN"]' \ 'add_runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]' ''; + + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath ${libgumath}/lib $out/${python.sitePackages}/gumath/_gumath.*.so + ''; + + checkPhase = '' + pushd python + mv gumath _gumath + # minor precision issues + substituteInPlace test_gumath.py --replace 'test_sin' 'dont_test_sin' + python test_gumath.py + python test_xndarray.py + popd + ''; + } + diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix new file mode 100644 index 0000000000000..5b2869e10d192 --- /dev/null +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, pytestCheckHook , pytestcov , numba +, numpy +, scikitlearn +, scipy +}: + +buildPythonPackage rec { + pname = "hyppo"; + version = "0.1.3"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "neurodata"; + repo = pname; + rev = "v${version}"; + sha256 = "0qdnb1l4hz4dgwhapz1fp9sb2vxxvr8h2ngsbvyf50h3kapcn19r"; + }; + + propagatedBuildInputs = [ + numba + numpy + scikitlearn + scipy + ]; + + checkInputs = [ pytestCheckHook pytestcov ]; + pytestFlagsArray = [ "--ignore=docs" ]; + + meta = with lib; { + homepage = "https://github.com/neurodata/hyppo"; + description = "Indepedence testing in Python"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index bcca68600e989..3e36b4dd8e2d2 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -30,6 +30,7 @@ , wtforms , psycopg2 # optional, for postgresql support , flask_testing +, pytestCheckHook }: # ihatemoney is not really a library. It will only ever be imported @@ -113,12 +114,19 @@ buildPythonPackage rec { ]; checkInputs = [ - flask_testing + flask_testing pytestCheckHook + ]; + + pytestFlagsArray = [ "--pyargs ihatemoney.tests.tests" ]; + disabledTests = [ + "test_notifications" # requires running service. + "test_invite" # requires running service. ]; passthru.tests = { - inherit (nixosTests) ihatemoney; + inherit (nixosTests.ihatemoney) ihatemoney-postgresql ihatemoney-sqlite; }; + meta = with lib; { homepage = "https://ihatemoney.org"; description = "A simple shared budget manager web application"; diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index 9bd2b4ab28820..bc87015f10462 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools -, setuptools_scm, jaraco_collections, importlib-metadata +, setuptools_scm, jaraco_collections, importlib-metadata, toml }: buildPythonPackage rec { @@ -16,6 +16,8 @@ buildPythonPackage rec { doCheck = false; + pythonImportsCheck = [ "irc" ]; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ six @@ -26,6 +28,7 @@ buildPythonPackage rec { pytz jaraco_itertools jaraco_collections + toml ]; meta = with lib; { diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index f351ea7a1c35e..22ff5caad80e6 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -7,9 +7,12 @@ , paramiko , netaddr , ncclient +, ntc-templates , lxml , jinja2 , pyyaml +, transitions +, yamlordereddictloader , nose }: @@ -22,11 +25,10 @@ buildPythonPackage rec { sha256 = "521659fe94da796897abc16773c3d84fa44d3e1f5386c71fbaef44cb80159855"; }; - checkInputs = [ nose ]; propagatedBuildInputs = [ - scp six pyserial paramiko netaddr ncclient lxml jinja2 pyyaml + scp six pyserial paramiko netaddr ncclient ntc-templates lxml jinja2 pyyaml transitions yamlordereddictloader ]; checkPhase = '' diff --git a/pkgs/development/python-modules/lightparam/default.nix b/pkgs/development/python-modules/lightparam/default.nix index b3ddb7655c0c8..0c3eb5292a88d 100644 --- a/pkgs/development/python-modules/lightparam/default.nix +++ b/pkgs/development/python-modules/lightparam/default.nix @@ -1,24 +1,31 @@ -{ lib, pkgs, buildPythonPackage, fetchPypi, isPy3k +{ lib, pkgs, buildPythonPackage, fetchFromGitHub, isPy3k +, ipython +, ipywidgets , numpy +, pyqt5 }: buildPythonPackage rec { pname = "lightparam"; version = "0.4.6"; disabled = !isPy3k; - format = "wheel"; - src = fetchPypi { - inherit pname version; - format = "wheel"; - python = "py3"; - sha256 = "eca63016524208afb6a06db19baf659e698cce3ae2e57be15b37bc988549c631"; + src = fetchFromGitHub { + owner = "portugueslab"; + repo = pname; + rev = "v${version}"; + sha256 = "13hlkvjcyz2lhvlfqyavja64jccbidshhs39sl4fibrn9iq34s3i"; }; propagatedBuildInputs = [ + ipython + ipywidgets numpy + pyqt5 ]; + pythonImportsCheck = [ "lightparam" ]; + meta = { homepage = "https://github.com/portugueslab/lightparam"; description = "Another attempt at parameters in Python"; diff --git a/pkgs/development/python-modules/mock-open/default.nix b/pkgs/development/python-modules/mock-open/default.nix index 449430a593d1a..391ba29a98c8a 100644 --- a/pkgs/development/python-modules/mock-open/default.nix +++ b/pkgs/development/python-modules/mock-open/default.nix @@ -1,17 +1,24 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, mock }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder, mock }: buildPythonPackage rec { pname = "mock-open"; - version = "1.3.1"; + version = "1.4.0"; # no tests in PyPI tarball src = fetchFromGitHub { owner = "nivbend"; repo = pname; rev = "v${version}"; - sha256 = "0ikhrhlkl5c7qbigpsv44jw89ws1z7j06gzyg5dh1ki533ifbjm2"; + sha256 = "0qlz4y8jqxsnmqg03yp9f87rmnjrvmxm5qvm6n1218gm9k5dixbm"; }; + patches = lib.optional (pythonOlder "3.0") + (fetchpatch { + name = "ascii-only.patch"; + url = "https://github.com/das-g/mock-open/commit/521ff260da127949fe4aceff1667cba223c5b07b.patch"; + sha256 = "0ampbhk7kwkn0q5d2h9wrflkr8fji2bybmdck4qdzw1qkslfwwrn"; + }); + propagatedBuildInputs = lib.optional (pythonOlder "3.3") mock; meta = with lib; { diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix index 0d5923820d272..0a6e5635a4fa1 100644 --- a/pkgs/development/python-modules/ndtypes/default.nix +++ b/pkgs/development/python-modules/ndtypes/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage +{ stdenv +, buildPythonPackage +, python , numpy , libndtypes , isPy27 @@ -24,5 +26,14 @@ buildPythonPackage { postInstall = '' mkdir $out/include cp python/ndtypes/*.h $out/include + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath ${libndtypes}/lib $out/${python.sitePackages}/ndtypes/_ndtypes.*.so + ''; + + checkPhase = '' + pushd python + mv ndtypes _ndtypes + python test_ndtypes.py + popd ''; } diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index 200392c85f8af..95f567a6c0c66 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -1,41 +1,32 @@ { stdenv , buildPythonPackage , fetchPypi -, pytest -, fetchpatch +, pythonOlder , glibcLocales +, importlib-resources +, pytestCheckHook }: buildPythonPackage rec { pname = "netaddr"; - version = "0.7.19"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd"; + sha256 = "0hx2npi0wnhwlcybilgwlddw6qffx1mb7a3sj4p9s7bvl33mgk6n"; }; LC_ALL = "en_US.UTF-8"; - checkInputs = [ glibcLocales pytest ]; - checkPhase = '' - # fails on python3.7: https://github.com/drkjam/netaddr/issues/182 - py.test \ - -k 'not test_ip_splitter_remove_prefix_larger_than_input_range' \ - netaddr/tests - ''; + propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.7") [ importlib-resources ]; - patches = [ - (fetchpatch { - url = "https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch"; - sha256 = "0s1cdn9v5alpviabhcjmzc0m2pnpq9dh2fnnk2x96dnry1pshg39"; - }) - ]; + checkInputs = [ glibcLocales pytestCheckHook ]; meta = with stdenv.lib; { - homepage = "https://github.com/drkjam/netaddr/"; + homepage = "https://netaddr.readthedocs.io/en/latest/"; + downloadPage = "https://github.com/netaddr/netaddr/releases"; + changelog = "https://netaddr.readthedocs.io/en/latest/changes.html"; description = "A network address manipulation library for Python"; license = licenses.mit; }; - } diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix new file mode 100644 index 0000000000000..923f8c1969862 --- /dev/null +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, textfsm +, pytestCheckHook +, ruamel_yaml +, yamllint +}: + +buildPythonPackage rec { + pname = "ntc-templates"; + version = "1.5.0"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "networktocode"; + repo = pname; + rev = "v${version}"; + sha256 = "0pvd9n7hcmxl9cr8m1xlqcjmy3k2hga0qmn2k3x9hripjis7pbbi"; + }; + + propagatedBuildInputs = [ textfsm ]; + + checkInputs = [ pytestCheckHook ruamel_yaml yamllint ]; + + # https://github.com/networktocode/ntc-templates/issues/743 + disabledTests = [ "test_raw_data_against_mock" "test_verify_parsed_and_reference_data_exists" ]; + + meta = with lib; { + description = "TextFSM templates for parsing show commands of network devices"; + homepage = "https://github.com/networktocode/ntc-templates"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 4fb029bad509a..7b160237d5ebf 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "parse"; - version = "1.16.0"; + version = "1.18.0"; src = fetchPypi { inherit pname version; - sha256 = "cd89e57aed38dcf3e0ff8253f53121a3b23e6181758993323658bffc048a5c19"; + sha256 = "91666032d6723dc5905248417ef0dc9e4c51df9526aaeef271eacad6491f06a4"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index f5169b68393d6..a113314aa4036 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -22,5 +22,6 @@ buildPythonPackage rec { description = "Python bindings to Slurm"; license = licenses.gpl2; maintainers = with maintainers; [ bhipple ]; + broken = true; # still needs slurm-19.05, but nixpkgs has slurm-20+ now }; } diff --git a/pkgs/development/python-modules/pyspice/default.nix b/pkgs/development/python-modules/pyspice/default.nix new file mode 100644 index 0000000000000..f2cce09c8b380 --- /dev/null +++ b/pkgs/development/python-modules/pyspice/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, libngspice +, numpy +, ply +, scipy +, pyyaml +, cffi +, requests +, matplotlib +, setuptools +}: + +buildPythonPackage rec { + pname = "PySpice"; + version = "1.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mnyy8nr06d1al99kniyqcm0p9a8dvkg719s42sajl8yf51sayc9"; + }; + + propagatedBuildInputs = [ + setuptools + requests + pyyaml + cffi + matplotlib + numpy + ply + scipy + libngspice + ]; + + doCheck = false; + pythonImportsCheck = [ "PySpice" ]; + + postPatch = '' + substituteInPlace PySpice/Spice/NgSpice/Shared.py --replace \ + "ffi.dlopen(self.library_path)" \ + "ffi.dlopen('${libngspice}/lib/libngspice${stdenv.hostPlatform.extensions.sharedLibrary}')" + ''; + + meta = with stdenv.lib; { + description = "Simulate electronic circuit using Python and the Ngspice / Xyce simulators"; + homepage = "https://github.com/FabriceSalvaire/PySpice"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ matthuszagh ]; + }; +} diff --git a/pkgs/development/python-modules/python-docx/default.nix b/pkgs/development/python-modules/python-docx/default.nix index 15ccd45760ddb..025a13958cd07 100644 --- a/pkgs/development/python-modules/python-docx/default.nix +++ b/pkgs/development/python-modules/python-docx/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { checkPhase = '' py.test tests + behave --format progress --stop --tags=-wip ''; meta = { diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index c54657b4bf589..f954a340b7fae 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, requests }: +{ lib, buildPythonPackage, fetchPypi, python, requests }: with lib; buildPythonPackage rec { pname = "requests-aws4auth"; @@ -9,15 +9,12 @@ buildPythonPackage rec { sha256 = "2950f6ff686b5a452a269076d990e4821d959b61cfac319c3d3c6daaa5db55ce"; }; - postPatch = optionalString isPy3k '' - sed "s/path_encoding_style/'path_encoding_style'/" \ - -i requests_aws4auth/service_parameters.py - ''; - propagatedBuildInputs = [ requests ]; - # The test fail on Python >= 3 because of module import errors. - doCheck = !isPy3k; + checkPhase = '' + cd requests_aws4auth + ${python.interpreter} test/requests_aws4auth_test.py + ''; meta = { description = "Amazon Web Services version 4 authentication for the Python Requests library."; diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index 23455ae89400c..9c7f89585d89a 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -5,6 +5,7 @@ , flask-compress , flask-cors , flask-sockets +, imageio , numpy , scipy , pillow @@ -25,7 +26,22 @@ buildPythonPackage rec { sha256 = "695d78f8edeb6a7ca98d8351adb36948d56cceeffe8a84896c9fbfd349fc4cb8"; }; - propagatedBuildInputs = [ flask flask-compress flask-cors flask-sockets numpy scipy pillow gevent wget six colorcet unidecode urllib3 ]; + propagatedBuildInputs = [ + colorcet + flask + flask-compress + flask-cors + flask-sockets + gevent + imageio + numpy + pillow + scipy + six + unidecode + urllib3 + wget + ]; # tests are not packaged in the released tarball doCheck = false; diff --git a/pkgs/development/python-modules/scikit-optimize/default.nix b/pkgs/development/python-modules/scikit-optimize/default.nix index f8e30397189bc..0a5171f22fbfa 100644 --- a/pkgs/development/python-modules/scikit-optimize/default.nix +++ b/pkgs/development/python-modules/scikit-optimize/default.nix @@ -1,25 +1,29 @@ { lib +, isPy27 , buildPythonPackage , fetchFromGitHub +, matplotlib , numpy , scipy , scikitlearn , pyaml -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "scikit-optimize"; - version = "0.6"; + version = "0.8.1"; + disabled = isPy27; src = fetchFromGitHub { owner = "scikit-optimize"; repo = "scikit-optimize"; rev = "v${version}"; - sha256 = "1srbb20k8ddhpcfxwdflapfh6xfyrd3dnclcg3bsfq1byrcmv0d4"; + sha256 = "1bz8gxccx8n99abw49j8h5zf3i568g5hcf8nz1yinma8jqhxjkjh"; }; propagatedBuildInputs = [ + matplotlib numpy scipy scikitlearn @@ -27,14 +31,9 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook ]; - # remove --ignore at next release > 0.6 - checkPhase = '' - pytest skopt --ignore skopt/tests/test_searchcv.py - ''; - meta = with lib; { description = "Sequential model-based optimization toolbox"; homepage = "https://scikit-optimize.github.io/"; diff --git a/pkgs/development/python-modules/shouldbe/default.nix b/pkgs/development/python-modules/shouldbe/default.nix index 1623d216ac9c9..068ed9343117f 100644 --- a/pkgs/development/python-modules/shouldbe/default.nix +++ b/pkgs/development/python-modules/shouldbe/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, pythonAtLeast , fetchPypi , nose , forbiddenfruit @@ -8,6 +9,8 @@ buildPythonPackage rec { version = "0.1.2"; pname = "shouldbe"; + # incompatible, https://github.com/DirectXMan12/should_be/issues/4 + disabled = pythonAtLeast "3.8"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix index c127f6ea2e567..24b334ef88228 100644 --- a/pkgs/development/python-modules/sslyze/default.nix +++ b/pkgs/development/python-modules/sslyze/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { patchPhase = '' substituteInPlace setup.py \ - --replace "cryptography>=2.6,<=2.9" "cryptography>=2.6,<=3" + --replace "cryptography>=2.6,<=2.9" "cryptography" ''; checkInputs = [ pytest ]; @@ -39,6 +39,7 @@ buildPythonPackage rec { tests/plugins_tests/certificate_info/test_certificate_utils.py \ -k "not (TestScanner and test_client_certificate_missing)" ''; + pythonImportsCheck = [ "sslyze" ]; propagatedBuildInputs = [ nassl cryptography typing-extensions faker ]; diff --git a/pkgs/development/python-modules/tensorflow/1/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix index 5f65004b3d686..1aad8677ca28d 100644 --- a/pkgs/development/python-modules/tensorflow/1/default.nix +++ b/pkgs/development/python-modules/tensorflow/1/default.nix @@ -132,6 +132,13 @@ let }) ./lift-gast-restriction.patch + (fetchpatch { + # fix compilation with numpy >= 1.19 + name = "add-const-overload.patch"; + url = "https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch"; + sha256 = "1xp1icacig0xm0nmb05sbrf4nw4xbln9fhc308birrv8286zx7wv"; + }) + # cuda 10.2 does not have "-bin2c-path" option anymore # https://github.com/tensorflow/tensorflow/issues/34429 ../cuda-10.2-no-bin2c-path.patch diff --git a/pkgs/development/python-modules/textfsm/default.nix b/pkgs/development/python-modules/textfsm/default.nix new file mode 100644 index 0000000000000..04bc47913d8f8 --- /dev/null +++ b/pkgs/development/python-modules/textfsm/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, six +, future +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "textfsm"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "v${version}"; + sha256 = "0fq2hphd89hns11nh0yifcp6brg6yy4n4hbvfk6avbjd7s40789a"; + }; + + patches = [ + (fetchpatch { + # remove pytest-runner dependency + url = "https://github.com/google/textfsm/commit/212db75fea4a79aca0f8f85a78954ffbc5667096.patch"; + sha256 = "0n6qh3sz9wy5gdpq9jjxx8firis48ypr20yacs5bqri59sziwjp0"; + }) + ]; + + propagatedBuildInputs = [ six future ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Python module for parsing semi-structured text into python tables"; + homepage = "https://github.com/google/textfsm"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix index 367c299a70c74..1e448c377096a 100644 --- a/pkgs/development/python-modules/word2vec/default.nix +++ b/pkgs/development/python-modules/word2vec/default.nix @@ -1,14 +1,23 @@ { stdenv , buildPythonPackage , fetchPypi +, fetchzip , cython , numpy , scikitlearn , six -, python +, setuptools_scm +, gcc +, pytest +, pytestcov , isPy27 }: - +let + testData = fetchzip { + url = "http://mattmahoney.net/dc/text8.zip"; + sha256 = "0w3l64bww9znmmvd9cqbfmh3dddnlrjicz43y5qq6fhi9cfqjfar"; + }; +in buildPythonPackage rec { pname = "word2vec"; version = "0.11.1"; @@ -19,17 +28,25 @@ buildPythonPackage rec { sha256 = "222d8ffb47f385c43eba45e3f308e605fc9736b2b7137d74979adf1a31e7c8b4"; }; + nativeBuildInputs = [ setuptools_scm gcc ]; + propagatedBuildInputs = [ cython numpy scikitlearn six ]; + checkInputs = [ pytest pytestcov ]; + + # Checks require test data downloaded separately + # See project source Makefile:test-data rule for reference checkPhase = '' - cd word2vec/tests; - ${python.interpreter} test_word2vec.py + PATH=$PATH:$out/bin + mkdir data + head -c 100000 ${testData}/text8 > data/text8-small + pytest ''; meta = with stdenv.lib; { description = "Tool for computing continuous distributed representations of words"; homepage = "https://github.com/danielfrg/word2vec"; - license = licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ NikolaMandic ]; }; diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix index 558e414debf83..3178e171f8442 100644 --- a/pkgs/development/python-modules/xnd/default.nix +++ b/pkgs/development/python-modules/xnd/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage +{ stdenv +, buildPythonPackage +, python , ndtypes , libndtypes , libxnd @@ -25,5 +27,14 @@ buildPythonPackage { postInstall = '' mkdir $out/include cp python/xnd/*.h $out/include + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath ${libxnd}/lib $out/${python.sitePackages}/xnd/_xnd.*.so + ''; + + checkPhase = '' + pushd python + mv xnd _xnd + python test_xnd.py + popd ''; } diff --git a/pkgs/development/python-modules/yamlordereddictloader/default.nix b/pkgs/development/python-modules/yamlordereddictloader/default.nix new file mode 100644 index 0000000000000..ce9602a4720c3 --- /dev/null +++ b/pkgs/development/python-modules/yamlordereddictloader/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, ordereddict +, pyyaml +}: + +buildPythonPackage rec { + pname = "yamlordereddictloader"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "03h8wa6pzqjiw25s3jv9gydn77gs444mf31lrgvpgy53kswz0c3z"; + }; + + propagatedBuildInputs = [ pyyaml ] ++ lib.optional (isPy27) ordereddict; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "yamlordereddictloader" ]; + + meta = with lib; { + description = "YAML loader and dump for PyYAML allowing to keep keys order"; + homepage = "https://github.com/fmenabe/python-yamlordereddictloader"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 8ea63aa155e99..5dba30e766368 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.35"; + version = "8.36"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1jvm49cbwyqxmz8zb9f6wim4rnna2dg1yk95123h46vl6s5cxcc0"; + sha256 = "1f8g330akx3sdc35dgvy6kksr7y3dnnj7029qrpn745bd9fh92hh"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 104b1c46e09d2..553f9ce928011 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 = "3.10.2"; + version = "4.0.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "19wdflkp4n0pds4lkliagg8l5kf9db5f5bn39akhwasc4yj0g7j2"; + sha256 = "06wpvqyv7w749l3ndvzg1p774rv1apbmbpwbdlad57pih4nqa7mm"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/development/tools/drip/default.nix index 2a7d2c6626bef..b4edf8ec081b5 100644 --- a/pkgs/development/tools/drip/default.nix +++ b/pkgs/development/tools/drip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk, which, makeWrapper }: +{ stdenv, fetchFromGitHub, jdk8, which, makeWrapper }: stdenv.mkDerivation rec { pname = "drip"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk ]; + buildInputs = [ jdk8 ]; postPatch = '' patchShebangs . diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index a9fb671f4a3b1..2f125d3ea8a36 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, jdk, maven, makeWrapper, jre_headless, pcsclite }: +{ stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }: +let jdk = jdk8; jre_headless = jre8_headless; in # TODO: This is quite a bit of duplicated logic with gephi. Factor it out? stdenv.mkDerivation rec { pname = "global-platform-pro"; diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index 4ce65518a8562..1e750a2dec507 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gopls"; - version = "0.4.4"; + version = "0.5.0"; src = fetchgit { rev = "gopls/v${version}"; url = "https://go.googlesource.com/tools"; - sha256 = "1h4ica6rwrdp5wg4ybpzvyvszj4m5l6w9hpvd9r2qcd9qdnqlykf"; + sha256 = "150jg1qmdszfvh1x5fagawgc24xy19xjg9y1hq3drwy7lfdnahmq"; }; modRoot = "gopls"; - vendorSha256 = "175051d858lsdir2hj5qcimp6hakbi9grpws1ssvk3r2jna27x1z"; + vendorSha256 = "1s3d4hnbw0mab7njck79qmgkjn87vs4ffk44zk2qdrzqjjlqq5iv"; doCheck = false; diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index a0bdfdb083d29..02b4d8abf2476 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -1,12 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "lazygit"; - version = "0.22.1"; - - goPackagePath = "github.com/jesseduffield/lazygit"; - - subPackages = [ "." ]; + version = "0.22.8"; src = fetchFromGitHub { owner = "jesseduffield"; @@ -15,6 +11,11 @@ buildGoPackage rec { sha256 = "1jq093nsfh7xqvsjvaad9wvqd3rjrpyp5fl8qxwbhaj3sxx19v7g"; }; + vendorSha256 = null; + subPackages = [ "." ]; + + buildFlagsArray = [ "-ldflags=-X main.version=${version} -X main.buildSource=nix" ]; + meta = with stdenv.lib; { description = "Simple terminal UI for git commands"; homepage = "https://github.com/jesseduffield/lazygit"; diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 0d6bcd959ebdd..47212e9967d05 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,24 +1,17 @@ -{ stdenv, lib, fetchurl, fetchpatch, libftdi1, libusb1, pkgconfig, hidapi }: +{ stdenv, lib, fetchgit, libftdi1, libusb1, pkgconfig, hidapi, autoreconfHook }: stdenv.mkDerivation rec { pname = "openocd"; - version = "0.10.0"; + version = "2020-09-02"; - src = fetchurl { - url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2"; - sha256 = "1bhn2c85rdz4gf23358kg050xlzh7yxbbwmqp24c0akmh3bff4kk"; + src = fetchgit { + url = "https://git.code.sf.net/p/openocd/code"; + rev = "d46f28c2ea2611f5fbbc679a5eed253d3dcd2fe3"; + sha256 = "1256qqhn3pxmijfk1x0y5b5kc5ar88ivykkvx0h1m7pdwqfs6zm9"; + fetchSubmodules = true; }; - patches = [ - # Fix FTDI channel configuration for SheevaPlug - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837989 - (fetchpatch { - url = "https://salsa.debian.org/electronics-team/openocd/raw/9a94335daa332a37a51920f87afbad4d36fad2d5/debian/patches/fix-sheeva.patch"; - sha256 = "01x021fagwvgxdpzk7psap7ryqiya4m4mi4nqr27asbmb3q46g5r"; - }) - ]; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ libftdi1 libusb1 hidapi ]; configureFlags = [ @@ -34,14 +27,9 @@ stdenv.mkDerivation rec { "--enable-remote-bitbang" ]; - NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ - "-Wno-implicit-fallthrough" - "-Wno-format-truncation" - "-Wno-format-overflow" - "-Wno-error=tautological-compare" - "-Wno-error=array-bounds" + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=cpp" - ]); + ]; postInstall = lib.optionalString stdenv.isLinux '' mkdir -p "$out/etc/udev/rules.d" @@ -64,7 +52,7 @@ stdenv.mkDerivation rec { "remote target" for source-level debugging of embedded systems using the GNU GDB program. ''; - homepage = "http://openocd.sourceforge.net/"; + homepage = "https://openocd.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index f4cf500c2f9cf..3cb5ae2b93063 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib -, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem +{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at-spi2-atk, at-spi2-core +, gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem }: let @@ -10,7 +10,7 @@ let fontconfig pango atk - gtk2 + gtk3 glib freetype dbus @@ -20,8 +20,8 @@ let cups expat udev - - gnome2.GConf + at-spi2-atk + at-spi2-core xorg.libX11 xorg.libXcursor @@ -38,11 +38,10 @@ let ]; in stdenv.mkDerivation rec { pname = "react-native-debugger"; - version = "0.9.10"; - + version = "0.11.4"; src = fetchurl { url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; - sha256 = "158275sp37smc8lnrcbj56lp7aa6fj9gzb6fzjgz9r980qgzhia6"; + sha256 = "1dnlxdqcn90r509ff5003fibkrprdr0ydpnwg5p0xzs6rz3k8698"; }; buildInputs = [ unzip ]; @@ -52,15 +51,15 @@ in stdenv.mkDerivation rec { unzip $src -d $out mkdir $out/{lib,bin,share} - mv $out/lib{node,ffmpeg}.so $out/lib + mv $out/{libEGL,libGLESv2,libvk_swiftshader,libffmpeg}.so $out/lib mv $out/!(lib|share|bin) $out/share patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath ${rpath}:$out/lib \ - $out/share/React\ Native\ Debugger + $out/share/react-native-debugger - ln -s $out/share/React\ Native\ Debugger $out/bin/React\ Native\ Debugger + ln -s $out/share/react-native-debugger $out/bin/react-native-debugger install -Dm644 "${desktopItem}/share/applications/"* \ -t $out/share/applications/ @@ -68,10 +67,10 @@ in stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = "rndebugger"; - exec = "React\\ Native\\ Debugger"; + exec = "react-native-debugger"; desktopName = "React Native Debugger"; genericName = "React Native Debugger"; - categories = "Development;Tools;"; + categories = "Development;Debugger;"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 3e1b1cced1ac4..1495b811d09bc 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.31.1"; + version = "7.32.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "14df24gj0mljblzc78pggyajr7004mg35gary5cz2c26vcklx4pw"; + sha256 = "0dn9awzhaafsdsiwwj6870zyqw4spsmc08zgcc5dhnpcnjcyldf3"; name = "${pname}.tar.gz"; }; diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index eeb8bd7f9db2f..20e31c979e6ff 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.25.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "0swcl8cxz64yw8dl9macz8ar1ccwrkwz89j7s1f60inb5jlxifqm"; + sha256 = "0i1cvwzwmcb07ynz1nk2svprfhsgcqmagvj5jfzayvcb1a2ww23b"; }; # Patch hard-coded paths and remove force library builds diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 0664af117e1ee..2a4df9bf7cf75 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -86,6 +86,8 @@ let twbt = twbt; dfhack = dfhack; dwarf-therapist = dwarf-therapist; + + jdk = pkgs.jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; }) (lib.attrNames self.df-hashes)); @@ -104,7 +106,9 @@ let soundSense = callPackage ./soundsense.nix { }; - legends-browser = callPackage ./legends-browser {}; + legends-browser = callPackage ./legends-browser { + jre = pkgs.jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; themes = recurseIntoAttrs (callPackage ./themes { stdenv = stdenvNoCC; diff --git a/pkgs/games/dwarf-fortress/themes/themes.json b/pkgs/games/dwarf-fortress/themes/themes.json index 48f47c4fbb9ee..8b0b9127d5b13 100644 --- a/pkgs/games/dwarf-fortress/themes/themes.json +++ b/pkgs/games/dwarf-fortress/themes/themes.json @@ -1,8 +1,8 @@ [ { "name": "afro-graphics", - "version": "47.02", - "sha256": "0np4jc05905q3bjplbrfi09q4rq3pjbf2vmbrmazfagj2mp8m7z5" + "version": "47.04", + "sha256": "1x1ir0qi3g8wgzwm1pnrkrqb6lhnjq87vs30l8kva6y5wr4sz7q0" }, { "name": "autoreiv", @@ -21,48 +21,53 @@ }, { "name": "gemset", - "version": "47.02", - "sha256": "0gz6cfx9kyldh5dxicyw0yl9lq4qw51vvlpzl767ml0bx3w38bwy" + "version": "47.04", + "sha256": "015nkkdnpykhz6a1n8qi3wgap19a4wavz4n2xbvfa4g770lcjd92" }, { "name": "ironhand", - "version": "47.02", - "sha256": "0j612xxz8g91zslw3a6yls3bzzmz0xdi2n0zx9zkmpzcl67f39ry" + "version": "47.04", + "sha256": "0x3hi1isgc2cv7c3qz87rm7ik0kbd748djpnghvjdqpj3a0n1ih2" }, { "name": "jolly-bastion", - "version": "47.02", - "sha256": "1df2hvm72lklmhhphcwsqm1m3dnaqxd8qvpygg5x71cfgkjd41ic" + "version": "47.04", + "sha256": "0799ad90g62nvpdcl6zq3vr2nvfc62lprm4br9n2hbs8wgrra6rq" }, { "name": "mayday", - "version": "47.01", - "sha256": "02fby7y4zzq8qgq2wsdvzp1k6zgfhdkm768zp0zzj9byi6gmnaq6" + "version": "47.04a", + "sha256": "1hpj40762n81grsddg3nc5jxc0bqmy2xamxvsgxzb2bx0b7akz0w" + }, + { + "name": "meph", + "version": "47.04_v5.5.0_V1.1.2", + "sha256": "0q8hfm66rag61qd2hab7lsr4nyg52bn1hvy6bl7z6kv4yj5cra50" }, { "name": "obsidian", - "version": "47.02", - "sha256": "03b26z557099k0l44lizagh17pz1y6apy496ivzv426xy0mzz684" + "version": "47.04a", + "sha256": "0y5kmj362i9y8w1n5d1nx80yq88c0xqps9i02gvnls6r421a4nms" }, { "name": "phoebus", - "version": "47.02a", - "sha256": "16zllnkrxi2365rd5m392xv72a9wvai0l3pz8xwkb8nlws8f58lb" + "version": "47.04a", + "sha256": "1ihbqs5a3b8pydbcynblvgw2bxkgr9hhpmgjlji7a7zvz8m6h6pw" }, { "name": "rally-ho", - "version": "47.02", - "sha256": "0xw2psmfjrgab0267scc7frgl9h1ypc0mbymn8z3x06m5wc3hbdh" + "version": "47.04", + "sha256": "0pmvpfbj07ll674lw7mjgkb4kgjk4mxr82fjq4ppvwrnzx6vi2g0" }, { "name": "spacefox", - "version": "47.02", - "sha256": "180fp2s489m2arc2z11j1qjnpcadjjkyami13yr3zd0v7msg64h8" + "version": "47.04", + "sha256": "0sk3k5bcpfl2xind4vfrgzbcqqbw0mg47pm3d3h44vi6hl3bdaqj" }, { "name": "taffer", - "version": "47.01b", - "sha256": "0b5hnli3gg32r7yvb3x1fqrmpxlk33j1hila2wiihybkkfnvxy5f" + "version": "47.04", + "sha256": "1ly2sc0pb2kybb8grj19zx372whblmd0bj8p64akpi2rrywi13sy" }, { "name": "tergel", @@ -70,8 +75,13 @@ "sha256": "142sd1i11vvirn68rp4gqzl67ww597df1lc57ycnpnz0n3q39kxy" }, { + "name": "vettlingr", + "version": "1.4a", + "sha256": "1p4y0dm52rb49dnmcnivddlsd94m4gr1pxn04fpjbrvck22klgpj" + }, + { "name": "wanderlust", - "version": "47.02", - "sha256": "0c36nxry189qdyinjk03wwm3j7q9q7b2sabkv7glx8yz2i61j5q9" + "version": "47.04", + "sha256": "1z56m8zplq5d18sbkwg5lwcy8iwfa5hbxixsm3hdxm04qyld1z89" } ] diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index bcdd950de4ad9..472a8b2966c8d 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -1,6 +1,7 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, jdk8, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }: let + jdk = jdk8; libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; in mkDerivation rec { pname = "multimc"; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 2c8063d4a050e..32acef9757be9 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -35,7 +35,7 @@ let # Steam VR procps usbutils - ] ++ lib.optional withJava jdk + ] ++ lib.optional withJava jdk8 # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 ++ lib.optional withPrimus primus ++ extraPkgs pkgs; diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 523ae354b7600..bce8fde3acd60 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -65,9 +65,11 @@ in stdenv.mkDerivation rec { ln -s "${videos}" "uqm-${version}/content/addons/3dovideo" ''; - # Using _STRINGS_H as include guard conflicts with glibc. postPatch = '' + # Using _STRINGS_H as include guard conflicts with glibc. sed -i -e '/^#/s/_STRINGS_H/_UQM_STRINGS_H/g' src/uqm/comm/*/strings.h + # See https://github.com/NixOS/nixpkgs/pull/93560 + sed -i -e 's,/tmp/,$TMPDIR/,' build/unix/config_functions ''; # uqm has a 'unique' build system with a root script incidentally called diff --git a/pkgs/misc/emulators/sameboy/default.nix b/pkgs/misc/emulators/sameboy/default.nix new file mode 100644 index 0000000000000..e90cc5a00f505 --- /dev/null +++ b/pkgs/misc/emulators/sameboy/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub, gtk3, rgbds, SDL2, wrapGAppsHook, glib }: + +stdenv.mkDerivation rec { + pname = "sameboy"; + version = "0.13.6"; + + src = fetchFromGitHub { + owner = "LIJI32"; + repo = "SameBoy"; + rev = "v${version}"; + sha256 = "04w8lybi7ssnax37ka4qw7pmcm7cgnmk90p9m73zbyp5chgpqqzc"; + }; + + enableParallelBuilding = true; + # glib and wrapGAppsHook are needed to make the Open ROM menu work. + nativeBuildInputs = [ rgbds glib wrapGAppsHook ]; + buildInputs = [ SDL2 ]; + + makeFlags = "CONF=release DATA_DIR=$(out)/share/sameboy/"; + + patchPhase = '' + sed 's/-Werror //g' -i Makefile + sed 's@"libgtk-3.so"@"${gtk3}/lib/libgtk-3.so"@g' -i OpenDialog/gtk.c + ''; + + installPhase = '' + pushd build/bin/SDL + install -Dm755 sameboy $out/bin/sameboy + rm sameboy + mkdir -p $out/share/sameboy + cp -r * $out/share/sameboy + popd + ''; + + meta = with stdenv.lib; { + homepage = "https://sameboy.github.io"; + description = "Game Boy, Game Boy Color, and Super Game Boy emulator"; + + longDescription = '' + SameBoy is a user friendly Game Boy, Game Boy Color and Super + Game Boy emulator for macOS, Windows and Unix-like platforms. + SameBoy is extremely accurate and includes a wide range of + powerful debugging features, making it ideal for both casual + players and developers. In addition to accuracy and developer + capabilities, SameBoy has all the features one would expect from + an emulator – from save states to scaling filters. + ''; + + license = licenses.mit; + maintainers = with maintainers; [ NieDzejkob ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 05e13f3c9aaee..21615b0c2b655 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -15,6 +15,7 @@ buildPythonApplication rec { patches = [ ./css.patch ./menubar.patch + ./texinfo.patch ./webbrowser.patch ]; diff --git a/pkgs/misc/solfege/texinfo.patch b/pkgs/misc/solfege/texinfo.patch new file mode 100644 index 0000000000000..d681b3e901bd8 --- /dev/null +++ b/pkgs/misc/solfege/texinfo.patch @@ -0,0 +1,20 @@ +Fix build with texinfo 6.7. Otherwise + + makeinfo -I topdocs --no-split --no-headers --output AUTHORS topdocs/AUTHORS.texi + +fails with + + utf8 "\xC1" does not map to Unicode at /nix/store/...-texinfo-6.7/share/texinfo/Texinfo/ParserNonXS.pm line 1796, <FH> line 38. + +--- a/topdocs/AUTHORS.texi ++++ b/topdocs/AUTHORS.texi +@@ -1,2 +1,3 @@ + \input texinfo ++@documentencoding ISO-8859-1 + @setfilename AUTHORS.info +--- a/topdocs/README.texi ++++ b/topdocs/README.texi +@@ -1,2 +1,3 @@ + \input texinfo ++@documentencoding ISO-8859-1 + @setfilename README.info diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index f1f1bc5c8c59e..8efa0000da7b6 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -184,6 +184,17 @@ in rec { }; }; + nord = mkDerivation rec { + pluginName = "nord"; + version = "0.3.0"; + src = pkgs.fetchFromGitHub { + owner = "arcticicestudio"; + repo = "nord-tmux"; + rev = "v${version}"; + sha256 = "14xhh49izvjw4ycwq5gx4if7a0bcnvgsf3irywc3qps6jjcf5ymk"; + }; + }; + maildir-counter = mkDerivation { pluginName = "maildir-counter"; version = "unstable-2016-11-25"; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 2b340c0f42667..90dd6c94d3732 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -137,12 +137,12 @@ let asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-vim"; - version = "2020-08-09"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "0d4ec1805d50fd39b8b41626e0761736feb307d0"; - sha256 = "0lcqdh51fd8lx1g02dcwrfnnx3zfm71g57nv2pmin5ap7qgh8kir"; + rev = "20a279b079452dba6e841755f8e9cc5aed75d05e"; + sha256 = "0fsafx0h3nmsrsscg233cyfhm2vj6n1k0n37l2mg0kbv77pzicga"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -389,12 +389,12 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2020-09-14"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "29ae0c4c07d735e27b780b48e7a1f12a8bcb1aa4"; - sha256 = "012ixvjs6cj7f1s9l26fkmmvzlv6wxy9awi2rgs71bwqgflxxksk"; + rev = "fd1fbf5eaba58ff25cae154bc98b3ceaa6467d8b"; + sha256 = "0h9ff2n7mw00vn0yw5jkfa8p8ii9gj25lnir7812b182480my1mg"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -413,12 +413,12 @@ let coc-markdownlint = buildVimPluginFrom2Nix { pname = "coc-markdownlint"; - version = "2020-09-02"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-markdownlint"; - rev = "9e68427e138bcce5440fd29fd632081962f6c6e9"; - sha256 = "064afqfjjx1ad26sgbypzivcpdx5n45wa5d93dbib4wrvkkqyslm"; + rev = "3da74c203bf9db5c702142791338c1fdeec3310d"; + sha256 = "09zh0pchv0iirr7hfig1x6zai90fzg33ap9n6dhd3fa2yrd8qgci"; }; meta.homepage = "https://github.com/fannheyward/coc-markdownlint/"; }; @@ -437,12 +437,12 @@ let coc-spell-checker = buildVimPluginFrom2Nix { pname = "coc-spell-checker"; - version = "2020-08-01"; + version = "2020-09-15"; src = fetchFromGitHub { owner = "iamcco"; repo = "coc-spell-checker"; - rev = "c1fe3de47f6ba93d4c44b514e530517c19a75880"; - sha256 = "1yvcbfrd5lxgmxbvphpbzcw8ni6zjqmg2flkrvnz59b9rmafn8dg"; + rev = "a76ebbff41fec61bb7a3c2556a670720db3f9ff9"; + sha256 = "0i2znngg8jyxgns1kqi5168c4899wj2b8h8n14yy6pxgidhgqvzp"; }; meta.homepage = "https://github.com/iamcco/coc-spell-checker/"; }; @@ -522,12 +522,12 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-09-14"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "3cffa5b8a6494af618d050578e2b8d8c5b70c447"; - sha256 = "160j3al4lcgd68a2qscnfsnsdp2wj3xbs58wr8w9cxfa19xn85nd"; + rev = "f6f63add3a6004183ae6f2fff12b5b9f5067f493"; + sha256 = "059msciykax5gcf71i80zxn0qm9hpf7g7k5cn8h2xqxil13jxrin"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -570,24 +570,24 @@ let context_filetype-vim = buildVimPluginFrom2Nix { pname = "context_filetype-vim"; - version = "2020-04-27"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "a96f74ac35b77ebe2c5788ca31e66d87ab239adb"; - sha256 = "1pgb86cpv4649qnxfw4280sqghldm66s572pg610giqjxda4a52s"; + rev = "cf25d744ac35872364c49fac3cb6a546e8af92ce"; + sha256 = "0mq0wh6kihmn5izaz81zl274yxc1x4gr9qmz9sjdhh122i9gbfs8"; }; meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2020-09-08"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "828f950097e33325912fd142aa3c4c284c081986"; - sha256 = "1qwc40fvfbhnn160m0clab4kcd1laqibhp7rvivqnk537pw5fk6l"; + rev = "7ea2fd5f42910dcd10eaaccddedcc33f2edd2ef1"; + sha256 = "1f14sg9v80ir9f1zk4xqjbqqd0cv2pxpipbflzwafmwcs5chz6rv"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -726,12 +726,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-09-13"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "f5beca0c3b652c0c34bfb0f45636f8f99ce0aeef"; - sha256 = "028d6riqvfd7cgdl16vqhnq06ihjmlv27hdpz0ccpkh2yszq16iq"; + rev = "ac40f5170ba097efec0f9055c92fe95e20ee2a7e"; + sha256 = "031bgs5ypw20ffml7x2nbrfzpi4zqb64d1n9j3blyy4yyaa60089"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -774,12 +774,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-09-11"; + version = "2020-09-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "b9b332a3080708da5f5895965da66c4dbe70bd4c"; - sha256 = "0mifp2ykb0lbf1mbm15p5ywhwcxq8w8ilqcyqbsxakc8pwrl0zw6"; + rev = "7d54f44e1035aea4cba99bdb34f0565b55008706"; + sha256 = "1bjslhsw3xm4pvzks7b1v7il8ap2mr7n64sv2sgx56c5fl410pkl"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1052,12 +1052,12 @@ let diagnostic-nvim = buildVimPluginFrom2Nix { pname = "diagnostic-nvim"; - version = "2020-07-25"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "diagnostic-nvim"; - rev = "03670688e70fc65eff70abb3cefe1a086ee95bf8"; - sha256 = "02nci7n9lpz1axpwzpv34r6720iycfh43n1910ryhm4f7cxs2x61"; + rev = "49abd2e71772f6976b7e1360782570535069bc94"; + sha256 = "16i99j76j1s8p7kjyr49pwj9jlqiq0krzwyxxk1z16shfymvav88"; }; meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; }; @@ -1872,12 +1872,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-09-12"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "8823c393fe344daee96d6de0250197d2fbc91dd3"; - sha256 = "050mwgb378vxfdjfvawz2s110pd523jgzx05p8hksk9nm4j2a05n"; + rev = "b9024dcb4204437452b84dfd83bd39748bfc7cd3"; + sha256 = "1m896054kz44k8kfmp4pmashin85n41gddnhsv1657dgd2dyzply"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -2256,12 +2256,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-09-13"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "9d1031b809514c0718753db44f268546c37782f6"; - sha256 = "1szfhwxd255rhd94js8jmnk5idd2qbq3fajdjxyaiz775zyfhsiz"; + rev = "edb1751fbe5330f32ded49d736b8c403ae071fba"; + sha256 = "19m0yyasjnm5863yw9qlkbschj6f901p6qn89brf2ml7app9vmb4"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2352,12 +2352,12 @@ let neovim-fuzzy = buildVimPluginFrom2Nix { pname = "neovim-fuzzy"; - version = "2020-09-09"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "cloudhead"; repo = "neovim-fuzzy"; - rev = "fae31a285e719a938c19f465ab4b21387e56bbff"; - sha256 = "0ykalrnqp66jr9jnn3ixcmi429w3c2wq7fbl21cnb9iql0gh719j"; + rev = "78f4d79f703aff49c9bcee5d527234c2f64425d5"; + sha256 = "1dq79jabyyyphgigqac9jf7hhadfh336fm8hklh1d64xlzyrfp6s"; }; meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/"; }; @@ -2496,12 +2496,12 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2020-08-22"; + version = "2020-09-15"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "004dc3cfa93fb56baeaed55291cf356dd1b18f9b"; - sha256 = "0x4r0s9rm2zk8rrvw2m1rfmagmy68d88bmxiqps2c3fb9zd1c7ny"; + rev = "db06dcbdc480b936b2da3028addb80807fdc8ed6"; + sha256 = "1d3jg75l8zgwxigmyy274rhn8ldfx003qzmfj2abd9lncqcs43va"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -2544,12 +2544,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-09-14"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "f8a76d6de6740ee736c32628dadf41a73c008612"; - sha256 = "13mrw57w14j172igfd2jv0nlf606iq343bh709ir86cpliq51n9p"; + rev = "b2e1ea1edf2cb42d20a941595cd0b4fcb871a0b5"; + sha256 = "1lg7mmp87r35h9rsf8pkngnxkgrjwg43a3aig6zmg37v58kgwv1j"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3830,12 +3830,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-09-09"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "f5693986c4ce82e50f4feebda22cf8c2fed35438"; - sha256 = "0jl58s0xp2snhpn5f7r3gacj6fi88hc8anxj9r36gww24j4y7kzw"; + rev = "3740312de0be5200286260816e2563e77c0be0c5"; + sha256 = "0ia4h37gnxqagjz3yb2r6awp016iyc6dr0n84k2205g5pqck5b2x"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4046,12 +4046,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-09-13"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "92c4da683f71cc1c2a17308712bb0b2f60168560"; - sha256 = "0f8dcvfb4br8al73x4i7zs39z78hvd2rfmxiakj0di7a60i9v1yh"; + rev = "415fd21e109ca05e22a38613f93baf1f96ede08c"; + sha256 = "066k0mdcxqv2hl9jdy93i6v5mi8mhr3q8zr1cd5xrxsxzgv9r476"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4610,12 +4610,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2020-09-10"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "9de0fdeba46ec03d645f8ad093978961f405b81d"; - sha256 = "1s9d0h96vgzhff30bxqciv5pdj1im9pk8j1r3361ma9zk8fjsnrr"; + rev = "dfaecd8d3fede970a1e4c38e2287e0fa5a264253"; + sha256 = "0wkhib4cawh6hq1ihq851afdj6chkxw4a4dqgjkvz2f6krhpblj5"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -4754,24 +4754,24 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-09-07"; + version = "2020-09-15"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "9b9b527d61a6fe10a6d0c618cc0dd113b6aa7690"; - sha256 = "147yqgr7vrn2rj90qczp70fiqk3mj02p4v5qkkhwh1kspdqsjmp7"; + rev = "b919c60a6d1ca70a93d56fa4ee13dbcf412a8554"; + sha256 = "0sz08nbmk8pqlc4b1vypwv6xbhg7nrns6g1abp7xkzwn07lnrqb2"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; vim-grammarous = buildVimPluginFrom2Nix { pname = "vim-grammarous"; - version = "2019-03-30"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "rhysd"; repo = "vim-grammarous"; - rev = "083cbee6094c9ec347d7c75af421be27d2ec7e70"; - sha256 = "1cxycr2ijzxn9d5xgp9ri4f2i4d87a3100nsc11iwa2bzir4xsiz"; + rev = "a3d67402099ca3554dc06eb7cb514865e39ec0ea"; + sha256 = "0w1qicka7g386qg7iyfg7fh30hmdx5yvmh3qza6ifj5x4w99l0ri"; }; meta.homepage = "https://github.com/rhysd/vim-grammarous/"; }; @@ -5211,12 +5211,12 @@ let vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2019-11-04"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "c32357892f10117291461631d51a6bfd20e72b9a"; - sha256 = "0zqvcnbns0vbxkqr0mpiapql8cvp54nn5a6mwc7l24jr6plhiwmn"; + rev = "ebdf6988bac3d1ebc45b3e51a86f3c065cf60c24"; + sha256 = "0zw24lhgs37lpbbdv2ir9s7g0fd3gjhjx2kvv54cs6mjszg2qmsm"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -5355,12 +5355,12 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2020-09-01"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "a8dd16f59a1f56ee40d0d403a722b6d556fa04e9"; - sha256 = "1m08v4b0l88ly5jhklr4hx642gdypz315x9yhsni9bnxi9dhhkaa"; + rev = "46330cd0cbab3780b59a53c16fde6273bb217071"; + sha256 = "121pr3s13bcy1hqc4bcx0x7isg0x5izbrsvir33d39q2x0wj44my"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -5545,6 +5545,18 @@ let meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; + vim-nerdtree-syntax-highlight = buildVimPluginFrom2Nix { + pname = "vim-nerdtree-syntax-highlight"; + version = "2020-07-19"; + src = fetchFromGitHub { + owner = "tiagofumo"; + repo = "vim-nerdtree-syntax-highlight"; + rev = "1acc12aa7f773ede38538293332905f1ba3fea6a"; + sha256 = "0zm023mhi1si9g5r46md1v4rlls6z2m6kyn1jcfxjqyrgba67899"; + }; + meta.homepage = "https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/"; + }; + vim-nerdtree-tabs = buildVimPluginFrom2Nix { pname = "vim-nerdtree-tabs"; version = "2018-12-21"; @@ -5631,12 +5643,12 @@ let vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2020-08-20"; + version = "2020-09-14"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "a3b6c91b8cfed991ff469363a6c081df26a18f6c"; - sha256 = "15lk6a40rl37iswa8yhx5ns0k83n4wyi6afy62107x9wha8hagax"; + rev = "acee4ad4d65ddaf81895cca9e28baea4c13fa76a"; + sha256 = "0rrjcc5i1isia74nrrik5avkd0casbjhgyqb2ph2176gywz6h5y5"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -5847,12 +5859,12 @@ let vim-phabricator = buildVimPluginFrom2Nix { pname = "vim-phabricator"; - version = "2020-01-23"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-phabricator"; - rev = "065c7e3f2d92a6792b50f087393b2c9a10a1e825"; - sha256 = "0yhf347fhrs0aqsq1swqihyav32442lv2chzjr3mzqcym8zbzsh6"; + rev = "d5c0571f44f2c44ba32df2d12e52b4dfcd4921ed"; + sha256 = "003zi8dvyyhvlb30zz8ah7iai8pmwmsk2jwa38386ff0jfm6dkpq"; }; meta.homepage = "https://github.com/jparise/vim-phabricator/"; }; @@ -5895,12 +5907,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-09-13"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "4314841aa4772d98b186636bdbf34fcf48c74275"; - sha256 = "1qkhg6wx1ngvnf3x1bz089sb74f3018z9fs9bgzm6x0ar0jvy1iw"; + rev = "06548fe61765d8a68a289741ce8d30f04a037e60"; + sha256 = "18yiqj62vpkvnxgcy1hqbdy846g4c3i807d3bbiz1kgwf9jh50ik"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6063,12 +6075,12 @@ let vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2020-08-22"; + version = "2020-09-14"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "858a379bcb389d67abdb7e0eb1b0a1fa78d8ba39"; - sha256 = "077jxka05w452g7vrlx1dly85ddqv8z8fh3xklq6dvz016x306m4"; + rev = "3cc34304643abf8d28d2482e74119d0d5f4b5302"; + sha256 = "1j2a3kwcff4avniph4z8g4im59z8fs2kj7vkwzgalj828nncx5g6"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -6555,12 +6567,12 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2020-08-07"; + version = "2020-09-15"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "85402fc0f05c103da9d3416e34fb88237ca1de3c"; - sha256 = "1g8802wmhg5zjk51qfiqcvdclqwg8rfizfpz5jlskcayh82gxvg0"; + rev = "4c0ae1aa9324dc37e0d8bb672ecdcb313f97f75c"; + sha256 = "1rg9r0zpxwbzj710rm3jh9bvgdngmn8c4ikcv0rjk7d7wy2pclkn"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -6844,12 +6856,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-09-11"; + version = "2020-09-15"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "9e1acf352d5f25123ac9bee90e3722ac5712c65f"; - sha256 = "0iysn5b3x08y25c3nvnr1n6dinmy4hgl69gdxm6hm5xg9am27wnr"; + rev = "d74c0b97ab0514ac924daa6dde87bee005d3469a"; + sha256 = "0jg2prsdfhs0vq43flsm8clhbamnddpafn2ajwjcxgyjb6dn6ndj"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -6868,12 +6880,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-09-14"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "09c633bb3258ee4f17a5f0414a47433e7779ac66"; - sha256 = "1fj93ig249acqdxfhpvc4rrdwb5yzvwm83hfxxdb4g1d966xg0dw"; + rev = "3d2d4b8e6cb219d615d54e3fa31288ff85879711"; + sha256 = "1iadzwzf0v64a89zavw9dh1n6cp7388npm7zihcfdflhisrbrk22"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -7133,12 +7145,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-09-13"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "a9217a31bcfb17a953bcf600245426e3df9a4192"; - sha256 = "0adk5m5hql7ragvbfs110wpai3apyyb3lh9pj550jq1512d30xag"; + rev = "9b53bb31a04e4ad4aaad43f3b5200f2494c256ae"; + sha256 = "180w0ajhjvwscl1f0w15yrb1lhvxm878izici1wj0sn06gkb51cp"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7181,12 +7193,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-08-14"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "7f97d30914daea5b542a90eed747d5bd00afbb19"; - sha256 = "1ghpkyh9ga759v065yvn4xr8ccwamyr87jkq3av9fslxzfzhwdpm"; + rev = "7972a7c6ebb3d5a1ab505605477b0fb79b5a7700"; + sha256 = "0qh8kwvl5dbc3k3pqfpc7liqvisjh08v7w9igrh719v0zdhdlyhv"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -7314,12 +7326,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-09-10"; + version = "2020-09-16"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "37a149ee028bfb61a6e33dbfe30d7ce1343c9519"; - sha256 = "0sb93zy6h21aayal08fj57vd7xjhwjkxihbd6l3yqcxgdz9kr5ir"; + rev = "d98f896ada495c3687007313374b2f945a2f2fb4"; + sha256 = "1p6x5qd6zvzg3ypllsgl7n9vk18g67dqyqg4zg9j07c9fsqs6383"; 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 a384f3b658097..f97280adf7b01 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -490,6 +490,7 @@ thinca/vim-themis thinca/vim-visualstar thirtythreeforty/lessspace.vim thosakwe/vim-flutter +tiagofumo/vim-nerdtree-syntax-highlight tikhomirov/vim-glsl tmhedberg/SimpylFold tmsvg/pear-tree diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index f9f3013e1f96b..e617881a570cd 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,9 +1,9 @@ { - version = "2019.5"; + version = "2020.3"; sha256 = { - batman-adv = "1v18zvvg12jgywncbhxshgjc93r72ajpxgw22zp0zx22g2q13z99"; - alfred = "09npizg89ks1wm19l5xz0pq1ljpsbwy030xnprqnd0p53976wywa"; - batctl = "1b9w4636dq8m38nzr8j0v0j3b0vdsw84c58c2isc33h66dx8brgz"; + batman-adv = "0wrzh0k44zzjx2s5zj65hjkh4jm9y38qpis1s5cbx9cyj756slb5"; + alfred = "13bvccz90pkjl09jyw68gj23pbrw9b05w1vhds9sjggwf3jkj5w2"; + batctl = "0r2w2v4sy6wgr7mp9lc7yj9k4ldsbsm3425rjil7p0b17zmzf4rm"; }; } diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 7f16ecb9e6d45..cccc7550fba86 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation { pname = "can-isotp"; - version = "20180629"; + version = "20200910"; hardeningDisable = [ "pic" ]; src = fetchFromGitHub { owner = "hartkopp"; repo = "can-isotp"; - rev = "6003f9997587e6a563cebf1f246bcd0eb6deff3d"; - sha256 = "0b2pqb0vd1wgv2zpl7lvfavqkzr8mrwhrv7zdqkq3rz9givcv8w7"; + rev = "21a3a59e2bfad246782896841e7af042382fcae7"; + sha256 = "1laax93czalclg7cy9iq1r7hfh9jigh7igj06y9lski75ap2vhfq"; }; KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index f94e6d72d593f..5a66e536956fe 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "checksec"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "slimm609"; repo = "checksec.sh"; rev = version; - sha256 = "0gm438sfh84bif5d40wvaqrfl4dh3fxjvnjk9ab33al8ws3afpsj"; + sha256 = "0hw8bd7dj71m1ml9zvfab2j87jacs542z7a89nziapckmg6kmh6f"; }; patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ]; diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix new file mode 100644 index 0000000000000..df0017eadc1f7 --- /dev/null +++ b/pkgs/os-specific/linux/cpuid/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + pname = "cpuid"; + version = "20200427"; + + src = fetchurl { + name = "${pname}-${version}.src.tar.gz"; + url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; + sha256 = "1m31238z2ya8f8pzpyklwp0ksf5xicqrw1z941hhhx913wzldaf1"; + }; + + # For pod2man during the build process. + nativeBuildInputs = [ perl ]; + + # As runtime dependency for cpuinfo2cpuid. + buildInputs = [ perl ]; + + # The Makefile hardcodes $(BUILDROOT)/usr as installation + # destination. Just nuke all mentions of /usr to get the right + # installation location. + patchPhase = '' + sed -i -e 's,/usr/,/,' Makefile + ''; + + installPhase = '' + make install BUILDROOT=$out + + if [ ! -x $out/bin/cpuid ]; then + echo Failed to properly patch Makefile. + exit 1 + fi + ''; + + meta = { + description = "Linux tool to dump x86 CPUID information about the CPU"; + longDescription = '' + cpuid dumps detailed information about the CPU(s) gathered from the CPUID + instruction, and also determines the exact model of CPU(s). It supports + Intel, AMD, VIA, Hygon, and Zhaoxin CPUs, as well as older Transmeta, + Cyrix, UMC, NexGen, Rise, and SiS CPUs. + ''; + + platforms = [ "i686-linux" "x86_64-linux" ]; + license = stdenv.lib.licenses.gpl2; + homepage = "http://etallen.com/cpuid.html"; + maintainers = with stdenv.lib.maintainers; [ blitz ]; + }; + +} diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index 59f9c709e5fae..5e212825bab32 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -5,14 +5,19 @@ assert lib.versionAtLeast kernel.version "4.2" || lib.versionOlder kernel.version "4.0"; stdenv.mkDerivation rec { + # linux kernel above 5.7 comes with its own exfat implementation https://github.com/arter97/exfat-linux/issues/27 + # Assertion moved here due to some tests unintenionally triggering it, + # e.g. nixosTests.kernel-latest; it's unclear how/why so far. + assertion = assert lib.versionOlder kernel.version "5.8"; null; + name = "exfat-nofuse-${version}-${kernel.version}"; - version = "2019-09-06"; + version = "2020-04-15"; src = fetchFromGitHub { - owner = "AdrianBan"; + owner = "barrybingo"; repo = "exfat-nofuse"; - rev = "5536f067373c196f152061f5000fe0032dc07c48"; - sha256 = "00mhadsv2iw8z00a6170hwbvk3afx484nn3irmd5f5kmhs34sw7k"; + rev = "297a5739cd4a942a1d814d05a9cd9b542e7b8fc8"; + sha256 = "14jahy7n6pr482fjfrlf9ck3f2rkr5ds0n5r85xdfsla37ria26d"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 71b305a81b0d4..c903b88e35062 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -20,8 +20,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.19.a/linux-hardened-5.7.19.a.patch" }, "5.8": { - "name": "linux-hardened-5.8.9.a.patch", - "sha256": "1911zxi39h2s98n7xlpym0isbdcj964ymavywvw2lh18nry8934m", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.9.a/linux-hardened-5.8.9.a.patch" + "name": "linux-hardened-5.8.10.a.patch", + "sha256": "0myfn5iz7gljj977fwsi3vzvm3n66yihrj2w207m3sr9mw9hp6d9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.10.a/linux-hardened-5.8.10.a.patch" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index c57e8a21e0a5a..d50535e5d3289 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.145"; + version = "4.19.146"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1dzn7x5lz808r1sxxdrylh8k3c5n8ffqnz6anx2ywnpiz17q7g0p"; + sha256 = "0jl17yk3fpz0sx203l9l1fj5bly3jgsyr8hy5qa6py99fbk0qnim"; }; } // (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 a3423707bbb58..90f191c3681b6 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.65"; + version = "5.4.66"; # 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 = "0sdcdjhzvz7hksv74dgj0ck9adxzhph47r1ng1kf37fh2x28657m"; + sha256 = "1cnsrz21kcf0h7krpv9p1a7n59mybr5ii0jdi3yc3x3lcwvk06gz"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.8.nix b/pkgs/os-specific/linux/kernel/linux-5.8.nix index bb690cca27883..14abb483eee71 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8.9"; + version = "5.8.10"; # 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 = "0pz1jfgmds5xc63jfvlykqap4dqf9jpr8jmgz5wpszgih8dvrn4r"; + sha256 = "1wjsdc93xilag0pk205m2q0ixmpp93ql5qj0fm3qlqddgxm14vlx"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 456913c5e6d1a..81dcb5d4563b8 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,14 @@ -{ stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: +{ stdenv, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // { - version = "5.3.2020.04.04"; - modDirVersion = "5.3.0"; + version = "5.8.0-2020.09.07"; + modDirVersion = "5.8.0"; - src = fetchgit { - url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "a27d7265e75f6d65c2b972ce4ac27abfc153c230"; - sha256 = "0wnjl4xs7073d5ipcsplv5qpcxb7zpfqd5gqvh3mhqc5j3qn816x"; + src = fetchFromGitHub { + owner = "koverstreet"; + repo = "bcachefs"; + rev = "fb2821e72648f35d3cff61ac26041d634fd1dacf"; + sha256 = "0f9hx6fz27rm8h1lk9868v727klvyzcbw6hcgm5mypbfq1nqirdy"; }; 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 57c6b941c8d37..b9db2f103e819 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.9-rc4"; + version = "5.9-rc5"; extraMeta.branch = "5.9"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "080qd0dmxs0zmkpcx62vnf719wgkk64a3012r4vsaiymzhddxy8k"; + sha256 = "1f410hkrk1b5g9wkh6078ph03fiyxpmbd5kdl9w592afphcddbrc"; }; # 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 8dea4c1709255..ce90893586aab 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.8.7"; + version = "5.8.10"; in buildLinux (args // { @@ -12,7 +12,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-zen1"; - sha256 = "06s7dpfxvwqfyh8qm8krcaxy98ki26cgh67k12g734bclg4bqsc5"; + sha256 = "1mm4x2amnpwixvi7q8pj9my75b08ps2mafgz4j2iszpylkdzi53d"; }; extraMeta = { diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 3a2682b2cfe8e..92dc334135adb 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,6 +1,5 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl , libelf, cpio, elfutils -, utillinuxMinimal , writeTextFile }: @@ -281,7 +280,6 @@ let in assert (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") -> libelf != null; -assert stdenv.lib.versionAtLeast version "4.15" -> utillinuxMinimal != null; assert stdenv.lib.versionAtLeast version "5.8" -> elfutils != null; stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // { @@ -294,7 +292,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ] ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools ++ optional (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") libelf - ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinuxMinimal + # Removed utillinuxMinimal since it should not be a dependency. ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] ++ optional (stdenv.lib.versionAtLeast version "5.2") cpio ++ optional (stdenv.lib.versionAtLeast version "5.8") elfutils diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 61ad327c39427..6a9f807947d41 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "mmc-utils"; - version = "2018-12-14"; + version = "2019-10-04"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git"; - rev = "aef913e31b659462fe6b9320d241676cba97f67b"; - sha256 = "1mak9rqjp6yvqk2h5hfil5a9gfx138h62n3cryckfbhr6fmaylm7"; + rev = "73d6c59af8d1bcedf5de4aa1f5d5b7f765f545f5"; + sha256 = "18a7qm86gavg15gv4h6xfnapgq24v4dyvhwfp53lkssxyhjbli0z"; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index a8baefa98ea09..337e6c2a875ca 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils, gnugrep, gnused, ps, +{ stdenv, fetchurl, jre8, makeWrapper, bash, coreutils, gnugrep, gnused, ps, majorVersion ? "1.0" }: let @@ -54,6 +54,8 @@ let sha256 = "1vng5ipkjzqy0wijc706w2m1rjl5d0nsgbxiacci739y1jmjnn5r"; }; }; + + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 in with versionMap.${majorVersion}; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 2b06671e4e04c..cc77dbd4891d1 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.4.1"; + version = "20.02.5.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 = "071lwny7cj4idq0h03mmvkk4f4i6fgl3c5q8cvbh7z8px6k50cfp"; + sha256 = "09d4zyyjl5mcrzhzbh6nhc35mzim1sy0h0p2h468nwk1fbl81ff5"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index f788057e386fe..cc4447914c4cb 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.19.1"; + version = "1.19.3"; src = fetchPypi { inherit pname version; - sha256 = "0ddn3g3q0nkxpmw0xpjhnl0m1g3lrlp89abqbal9k6n689h6kfly"; + sha256 = "1r63gw9a4n2sd3520zadpn05zxfk45nqrgwxp3zky5nkyrh4qbys"; }; patches = [ diff --git a/pkgs/servers/microserver/default.nix b/pkgs/servers/microserver/default.nix new file mode 100644 index 0000000000000..9132ef9672bd4 --- /dev/null +++ b/pkgs/servers/microserver/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "microserver"; + version = "0.1.8"; + + src = fetchFromGitHub { + owner = "robertohuertasm"; + repo = "microserver"; + rev = "v${version}"; + sha256 = "1i9689ra5jnmhkxabrx4zcp5f422w9ql9m4xzldqwmpnckm736v6"; + }; + + cargoSha256 = "1yn3xmmhpixiviayicl2szlzfjx5crffp3pq75d5nz6ky3miai9l"; + + meta = with stdenv.lib; { + homepage = "https://github.com/robertohuertasm/microserver"; + description = "Simple ad-hoc server with SPA support"; + maintainers = with maintainers; [ flosse ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 8420f53aba3cf..55a328b21d554 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -1,17 +1,20 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests }: -buildGoPackage rec { +let pname = "miniflux"; - version = "2.0.21"; + version = "2.0.23"; + +in buildGoModule { + inherit pname version; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0yhzmfs35jfc7vq26r9c14v4lnv8sxj3pv23r2cx2rfx47b1zmk7"; + sha256 = "0v0n5lvrfn3ngs1s1m3hv95dvnqn8ysksb044m4ifk2cr3b77ryc"; }; - goPackagePath = "miniflux.app"; + vendorSha256 = "1iin5r9l8wb9gm0bwgdmpx0cp1q35ij4y7zf98lnj2kvb3jv5crp"; nativeBuildInputs = [ installShellFiles ]; @@ -23,9 +26,11 @@ buildGoPackage rec { postInstall = '' mv $out/bin/miniflux.app $out/bin/miniflux - installManPage go/src/${goPackagePath}/miniflux.1 + installManPage miniflux.1 ''; + passthru.tests = nixosTests.miniflux; + meta = with stdenv.lib; { description = "Minimalist and opinionated feed reader"; homepage = "https://miniflux.app/"; @@ -33,4 +38,3 @@ buildGoPackage rec { maintainers = with maintainers; [ rvolosatovs benpye ]; }; } - diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index e8f9923a87b92..9e4eadf72da7d 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.18.3"; + version = "0.19.0"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "0mgawr3nkyna22sqhskvvk7h9c8ivag959liji2qcdfwgfqp0l6z"; + sha256 = "1rfwhh62phz75kariqgpkxi4wzll1crzc34x0ybihxllpjf998zx"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "0rqkqyvf8mjl7b62ng7vzi6as6qw3sg3lzj2mcg1aiw3h7ikr6hw"; + vendorSha256 = "1bq8z31yxff0nybzjs7jz7rg61hgqz6l2scbab7062j8whg8wybb"; doCheck = false; diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 22b1bf200ed87..eca43dc6f13fd 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -3,16 +3,16 @@ let versions = { matomo = { - version = "3.14.0"; - sha256 = "05ycc4k4w01212pklzgxrbwpzp572jmj8i9ija6s7c01071yjjzv"; + version = "3.14.1"; + sha256 = "0gp6v797118z703nh0p77zvsizvdg0c2jkn26996d4sqw5pa78v3"; }; matomo-beta = { - version = "3.14.0"; + version = "3.14.1"; # `beta` examples: "b1", "rc1", null # TOOD when updating: use null if stable version is >= latest beta or release candidate beta = null; - sha256 = "05ycc4k4w01212pklzgxrbwpzp572jmj8i9ija6s7c01071yjjzv"; + sha256 = "0gp6v797118z703nh0p77zvsizvdg0c2jkn26996d4sqw5pa78v3"; }; }; common = pname: { version, sha256, beta ? null }: diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 751dd00efc7a0..e775ab04dc1e1 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.21"; + version = "0.9.22"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "16k8506fk54krpkls374cn3vm1dp9ixi0byh5xvi3m5a4bnbvrs0"; + sha256 = "04yd8y4lksmxbgl6v6bw1k32r8v5mia3sm8y9v39cgfzjbkvys1p"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 97deab47cfbb1..cc4c7903360f8 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,15 +4,15 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-09-14"; + version = "2020-09-20"; pname = "oh-my-zsh"; - rev = "2bc1da7f377e78cdfa74190ffe5baf6c814d0fce"; + rev = "93c837fec8e9fe61509b9dff9e909e84f7ebe32d"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1xr5nmd3q8yapc0yzx7cv9qh8gvgvn2rf2z3fhwxrap3z77jp5fv"; + sha256 = "1ww50c1xf64z1m0sy30xaf2adr87cqr5yyv9jrqr227j97vrwj04"; }; installPhase = '' diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 7c240aa41319f..74cc3f3f17116 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "1av5w32ia68j2xrw4m16mzm9jn6xlap93kwi8iqw0s6wgihzadds"; + sha256 = "1yclffhr76jd5rzqi37bpdj524lmywmgcfr9r0ahacfkp1hxdn3v"; }; - vendorSha256 = "13sc4yrzgx2sm98whibfy2kjia3yy9cdvibvhbvg2lz2spprjb9v"; + vendorSha256 = "133g2d7l1szmpxjdg28yjm3pw6galwq8948rvalnh932kxngkxys"; doCheck = false; @@ -36,6 +36,6 @@ buildGoModule rec { description = "A CLI for Amazon EKS"; homepage = "https://github.com/weaveworks/eksctl"; license = licenses.asl20; - maintainers = with maintainers; [ xrelkd ]; + maintainers = with maintainers; [ xrelkd Chili-Man ]; }; } diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 2a71556961e9d..3d62e39c6ed38 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.5"; + version = "4.6"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1nszzcyn8kvpnxppjbxky5x9a8n0jfmhy20j6nrwm3196gd6hirr"; + sha256 = "011fsyafmpis6j0aq7vwd56m2mcb9v3rn4f246ms5nx6zgmga0ip"; }; postPatch = '' diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 26158b0361d52..ee2af363a5668 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils -, liburcu, zlib, libaio, zstd, lz4, valgrind, python3Packages +{ stdenv, fetchFromGitHub, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils +, liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages , fuseSupport ? false, fuse3 ? null }: assert fuseSupport -> fuse3 != null; stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "2020-04-04"; + version = "2020-08-25"; - src = fetchgit { - url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "5d6e237b728cfb7c3bf2cb1a613e64bdecbd740d"; - sha256 = "1syym9k3njb0bk2mg6832cbf6r42z6y8b6hjv7dg4gmv2h7v7l7g"; + src = fetchFromGitHub { + owner = "koverstreet"; + repo = "bcachefs-tools"; + rev = "487ddeb03c574e902c5b749b4307e87e2150976a"; + sha256 = "1pcid7apxmbl9dyvxcqby3k489wi69k8pl596ddzmkw5gmhgvgid"; }; postPatch = '' @@ -29,10 +30,10 @@ stdenv.mkDerivation { buildInputs = [ libuuid libscrypt libsodium keyutils liburcu zlib libaio - zstd lz4 python3Packages.pytest + zstd lz4 python3Packages.pytest udev valgrind ] ++ stdenv.lib.optional fuseSupport fuse3; - doCheck = true; + doCheck = false; # needs bcachefs module loaded on builder checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index f9042645be0be..df6fb7bcda890 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, giblib, xlibsWrapper, autoreconfHook -, autoconf-archive, libXfixes, libXcursor }: +, autoconf-archive, libXfixes, libXcursor, libXcomposite }: stdenv.mkDerivation rec { pname = "scrot"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; repo = pname; rev = version; - sha256 = "0x70hd59ik37kqd8xqpwrz46np01jv324iz28x2s0kk36d7sblsj"; + sha256 = "12xq6glg70icwsvbnfw9gm4dahlbnrc7b6adpd0mpf89h4sj2gds"; }; nativeBuildInputs = [ autoreconfHook autoconf-archive ]; - buildInputs = [ giblib xlibsWrapper libXfixes libXcursor ]; + buildInputs = [ giblib xlibsWrapper libXfixes libXcursor libXcomposite ]; meta = with stdenv.lib; { homepage = "https://github.com/resurrecting-open-source-projects/scrot"; diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index 374e090af6ae8..a885060994482 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -10,8 +10,11 @@ rustPlatform.buildRustPackage rec { rev = "0febc4377134a2ea3b3cd43ebdf5ea688a0e7432"; sha256 = "1n0w5b3fjgbczy1iw52172x1p3y1bvw1qpz77fkaxkhrkgfd7vwr"; }; - sourceRoot = "source/svgbob_cli"; + postPatch = '' + substituteInPlace ../svgbob/src/lib.rs \ + --replace '#![deny(warnings)]' "" + ''; cargoSha256 = "1y9jsnxmz51zychmmzp6mi29pb5ks2qww7lk5bshkhp56v51sm8d"; diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index bdf68d708a5dc..7cec0cab996ea 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -14,7 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 pkgconfig vala_0_44 gobject-introspection wrapGAppsHook ]; buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ]; - postPatch = "patchShebangs ."; + postPatch = '' + substituteInPlace install.py \ + --replace 'platform.version()' '"Nix"' + + patchShebangs . + ''; buildPhase = "./build.py"; diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/tools/misc/birdfont/xmlbird.nix index e5ad56376cac7..eddcba1c9c891 100644 --- a/pkgs/tools/misc/birdfont/xmlbird.nix +++ b/pkgs/tools/misc/birdfont/xmlbird.nix @@ -13,7 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; - postPatch = "patchShebangs ."; + postPatch = '' + substituteInPlace configure \ + --replace 'platform.dist()[0]' '"nix"' + patchShebangs . + ''; buildPhase = "./build.py"; diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index e35d5283256e8..2b9cbfe103057 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cloc"; - version = "1.86"; + version = "1.88"; src = fetchFromGitHub { owner = "AlDanial"; repo = "cloc"; rev = version; - sha256 = "082gj2b3x11bilz8c572dd60vn6n0fhld5zhi7wk7g1wy9wlgm9w"; + sha256 = "1ixgswzbzv63bl50gb2kgaqr0jcicjz6w610hi9fal1i7744zraw"; }; setSourceRoot = '' diff --git a/pkgs/tools/misc/discocss/default.nix b/pkgs/tools/misc/discocss/default.nix new file mode 100644 index 0000000000000..43214c8663021 --- /dev/null +++ b/pkgs/tools/misc/discocss/default.nix @@ -0,0 +1,27 @@ +{ stdenvNoCC, lib, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "discocss"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "mlvzk"; + repo = pname; + rev = "v${version}"; + sha256 = "1818jca3sw2ngw1n488q82w5rakx4cxgknnkmsaa0sz4h8gldfy8"; + }; + + dontBuild = true; + + installPhase = '' + install -m755 -D ./discocss $out/bin/discocss + ''; + + meta = with lib; { + description = "A tiny Discord css-injector"; + homepage = "https://github.com/mlvzk/discocss"; + license = licenses.mpl20; + platforms = platforms.linux; + maintainers = with maintainers; [ mlvzk ]; + }; +} diff --git a/pkgs/tools/misc/ili2c/default.nix b/pkgs/tools/misc/ili2c/default.nix index 43eed8367c47b..2bda116e66ce2 100644 --- a/pkgs/tools/misc/ili2c/default.nix +++ b/pkgs/tools/misc/ili2c/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, jdk, ant, makeWrapper, jre }: +{ stdenv, fetchFromGitHub, jdk8, ant, makeWrapper, jre8 }: +let jdk = jdk8; jre = jre8; in stdenv.mkDerivation rec { pname = "ili2c"; version = "5.0.8"; diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index bdc3ac4ddebdf..ec6be6eba28b7 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl, dpkg -, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib -, gnome2, gnome3, libnotify, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }: +, alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib +, gnome2, gnome3, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }: let - - version = "1.17.0"; + version = "1.22.1"; rpath = stdenv.lib.makeLibraryPath [ alsaLib + at-spi2-atk + at-spi2-core atk cairo cups @@ -22,6 +23,8 @@ let gnome3.gtk gnome2.pango libnotify + libsecret + libuuid libxcb nspr nss @@ -46,7 +49,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "085xq1ik8kyza1kq9kn0pf98zk6g2qa21clxhn48rgnqk20aninv"; + sha256 = "1wbjj2w4dii644lprvmwnlval53yqh4y0f58cad657jjw8101rd9"; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; @@ -62,20 +65,30 @@ in stdenv.mkDerivation { buildCommand = '' IFS=$'\n' - dpkg -x $src $out - cp -av $out/usr/* $out + + # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here + dpkg --fsys-tarfile $src | tar --extract + + mkdir -p $out + mv usr/* $out + + # cp -av $out/usr/* $out rm -rf $out/share/lintian - #The node_modules are bringing in non-linux files/dependencies + + # The node_modules are bringing in non-linux files/dependencies find $out -name "*.app" -exec rm -rf {} \; || true find $out -name "*.dll" -delete find $out -name "*.exe" -delete + # Otherwise it looks "suspicious" chmod -R g-w $out + for file in `find $out -type f -perm /0111 -o -name \*.so\*`; do echo "Manipulating file: $file" patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true - patchelf --set-rpath ${rpath}:$out/share/mongodb-compass "$file" || true + patchelf --set-rpath ${rpath}:$out/lib/mongodb-compass "$file" || true done + wrapGAppsHook $out/bin/mongodb-compass ''; diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix index a3cf6ad07d5b6..593a8cfc637d5 100644 --- a/pkgs/tools/misc/ntfy/default.nix +++ b/pkgs/tools/misc/ntfy/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ stdenv, python3Packages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "ntfy"; version = "2.7.0"; @@ -11,11 +11,11 @@ pythonPackages.buildPythonApplication rec { sha256 = "09f02cn4i1l2aksb3azwfb70axqhn7d0d0vl2r6640hqr74nc1cv"; }; - checkInputs = with pythonPackages; [ + checkInputs = with python3Packages; [ mock ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ requests ruamel_yaml appdirs sleekxmpp dns emoji @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec { ]; checkPhase = '' - HOME=$(mktemp -d) ${pythonPackages.python.interpreter} setup.py test + HOME=$(mktemp -d) ${python3Packages.python.interpreter} setup.py test ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 3b9623d5ad0a5..5429ecea2c655 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,8 +1,8 @@ -{ stdenv, autoconf, automake, curl, fetchurl, jdk, jre, makeWrapper, nettools +{ stdenv, autoconf, automake, curl, fetchurl, jdk8, makeWrapper, nettools , python, git }: -with stdenv.lib; +let jdk = jdk8; jre = jdk8.jre; in stdenv.mkDerivation rec { pname = "opentsdb"; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index aa502f8521aba..e3b64939a0a4b 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.09.14"; + version = "2020.09.20"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "18wfhprbaszpxgqkac3hb050ngvdsaibbcifg88rkv5vc6bc2mq6"; + sha256 = "1pkw3hnkddk1kqv0in152q1k4jjgbmf2xvc9j3r5nd38z6f7j6mc"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 5f9f3ceef07b1..08c40a4ac8279 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.32.1"; + version = "2.33.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "15ng2c7i3jxmhpc2q0dl8arc72qbsq9y9paz5hgln907yy7dqx7c"; + sha256 = "1zsp4pml5pq8p1ipvarnlcfwcscch13iz1gzza5qm0yl01dl9qpk"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 1748a2d21d04e..64e6757891e3a 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = if hpnSupport then fetchurl { url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz"; - sha256 = "0lwr7xzhy8m4y0vzi1a78ddhag3qp6cba0c37mnhivbhb67dkywp"; + sha256 = "1ssdwgdxnvjwigisqi8c053znps5a4jf7bzsi99y0xyfzbw0x55k"; } else fetchurl { diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix deleted file mode 100644 index eccf38f39fdc2..0000000000000 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ fetchgit, stdenv, zlib, bzip2, docbook2x, pcre, curl, libxml2, libevent, perl -, pkgconfig, protobuf, tokyocabinet, tokyotyrant, opencv, autoconf, automake -, libtool, seeks_confDir ? "" -}: - -stdenv.mkDerivation { - name = "seeks-0.4.1"; - - src = fetchgit { - url = "git://github.com/beniz/seeks.git"; - rev = "1168b3a2f3111c3fca31dd961135194c3e8df5fd"; - sha256 = "18s2pxal9a2aayv63hc19vnkx5a5y9rhbipdpvkinbni5283iiar"; - }; - - buildInputs = - [ zlib bzip2 docbook2x pcre curl libxml2 libevent perl pkgconfig - protobuf tokyocabinet tokyotyrant opencv autoconf automake libtool - ]; - - configureFlags = - [ # Enable the built-in web server providing a web search interface. - "--enable-httpserv-plugin=yes" - "--with-libevent=${libevent.dev}" - ]; - - preConfigure = '' - ./autogen.sh - ''; - - postInstall = stdenv.lib.optionalString (seeks_confDir != "") '' - ln -svf ${seeks_confDir}/config $out/etc/seeks/config - ln -svf ${seeks_confDir}/cf-config $out/etc/seeks/cf-config - ln -svf ${seeks_confDir}/httpserv-config $out/etc/seeks/httpserv-config - ln -svf ${seeks_confDir}/img-websearch-config $out/etc/seeks/img-websearch-config - ln -svf ${seeks_confDir}/lsh-config $out/etc/seeks/lsh-config - ln -svf ${seeks_confDir}/query-capture-config $out/etc/seeks/query-capture-config - ln -svf ${seeks_confDir}/udb-service-config $out/etc/seeks/udb-service-config - ln -svf ${seeks_confDir}/uri-capture-config $out/etc/seeks/uri-capture-config - ln -svf ${seeks_confDir}/websearch-config $out/etc/seeks/websearch-config - ''; - - # FIXME: Test suite needs <https://code.google.com/p/googletest/>. - doCheck = false; - - meta = { - description = "Seeks, a social web search engine"; - - longDescription = - '' Seeks is a free and open technical design and application for - enabling social websearch. Its specific purpose is to regroup users - whose queries are similar so they can share both the query results - and their experience on these results. On this basis, Seeks allows - for true real-time, decentralized, websearch to emerge. - - In the long term, there is no need for web crawlers and third-party - web indexes as users can push content directly to search groups. - ''; - - license = stdenv.lib.licenses.agpl3Plus; - - homepage = "http://www.seeks-project.info/"; - - maintainers = [ - stdenv.lib.maintainers.matejc - ]; - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice - broken = true; # 2018-04-11 - }; -} diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix index bc8a0873f7845..fac43cabab865 100644 --- a/pkgs/tools/networking/v2ray/default.nix +++ b/pkgs/tools/networking/v2ray/default.nix @@ -3,22 +3,22 @@ }: let - version = "4.27.5"; + version = "4.28.2"; src = fetchFromGitHub { owner = "v2ray"; repo = "v2ray-core"; rev = "v${version}"; - sha256 = "168kz8hq7mcfy6h758mmrky550p04bi9jsfqhy67jcxq81874m2k"; + sha256 = "0q2gpnx7nrnrdkc8fq1ghbki8yyh11hs5bw8rb48jsrnigrg73b8"; }; - vendorSha256 = "0m889byxw70vv1mzlivalq444byp0y182nqqzdr458gfifvpc7s7"; + vendorSha256 = "1ghpb5ijpmmq1qysjifj6ss1zk1h2l55r6w7l4a01bp8sxncxarc"; assets = { # MIT licensed "geoip.dat" = let - geoipRev = "202009020005"; - geoipSha256 = "1xsy678cpqv6ycnhzl3pms76ic40aggq46q9dsd5ghj94mcx9837"; + geoipRev = "202009160005"; + geoipSha256 = "00hilqqnpfyvxxaiamwmkdpzid763xgig1vk4rxv76npwyixsmj4"; in fetchurl { url = "https://github.com/v2ray/geoip/releases/download/${geoipRev}/geoip.dat"; sha256 = geoipSha256; @@ -26,8 +26,8 @@ let # MIT licensed "geosite.dat" = let - geositeRev = "20200901194123"; - geositeSha256 = "0fjx1wrq14d9v326k4fjwca3h5nv8ghk11kprf6jkjncjszwvgby"; + geositeRev = "20200918144814"; + geositeSha256 = "08zdw20wdksp96436j3my145qvyvr9a15lj8j4wdagr64iap5nx7"; in fetchurl { url = "https://github.com/v2ray/domain-list-community/releases/download/${geositeRev}/dlc.dat"; sha256 = geositeSha256; diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 2d8902f690978..f12578b273380 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, jdk, ant, runtimeShell }: +{ stdenv, fetchFromGitHub, jdk8, ant, runtimeShell }: +let jdk = jdk8; in stdenv.mkDerivation rec { pname = "zap"; version = "2.7.0"; diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index fe7f41c4d08a5..02bc599f47dc2 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -1,18 +1,24 @@ -{ stdenv, lib, buildPythonApplication, fetchFromGitHub -, setuptools_scm, vdf -, wine, winetricks, zenity +{ stdenv +, lib +, buildPythonApplication +, fetchFromGitHub +, setuptools_scm +, vdf +, wine +, winetricks +, zenity , pytest }: buildPythonApplication rec { pname = "protontricks"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "083ncg6yjd7s3dx91zd52w166x709mnxknwwr78ggka8d8vlyi0b"; + sha256 = "0ri4phi1rna9snrxa6gl23walyack09mgax7zpjqfpxivwls3ach"; }; # Fix interpreter in mock run.sh for tests @@ -47,7 +53,7 @@ buildPythonApplication rec { description = "A simple wrapper for running Winetricks commands for Proton-enabled games"; homepage = "https://github.com/Matoking/protontricks"; license = licenses.gpl3; - platforms = with platforms; linux; maintainers = with maintainers; [ metadark ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/clevis/default.nix b/pkgs/tools/security/clevis/default.nix index daeb5e0d39c1d..878e4fc9febf1 100644 --- a/pkgs/tools/security/clevis/default.nix +++ b/pkgs/tools/security/clevis/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "clevis"; - version = "13"; + version = "14"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "v${version}"; - sha256 = "1p522jjksxmdwjjxa32z2ij1g81ygpkmcx998d07g8pb6rfnknjy"; + sha256 = "1j8id67jk3ikim2xh7vjg7j2ayrpm1a4n8v3n8r8pnr4rhqy76fd"; }; nativeBuildInputs = [ meson ninja pkgconfig asciidoc ]; diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 23c25accc9304..728ea0a92da5c 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -2,27 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "jwt-cli"; - version = "3.1.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "mike-engel"; repo = pname; rev = version; - sha256 = "0pmxis3m3madwnmswz9hn0i8fz6a9bg11slgrrwql7mx23ijqf6y"; + sha256 = "07mnkr7hi29fyyyn7llb30p4ndiqz4gf1lnhm44qm09alaxmfvws"; }; - cargoSha256 = "165g1v0c8jxs8ddm8ld0hh7k8mvk3566ig43pf99hnw009fg1yc2"; - - patches = [ - # to fix `cargo test -- --test-threads $NIX_BUILD_CORES` - (fetchpatch { - url = "https://github.com/mike-engel/jwt-cli/commit/df87111f3084abdecce5d58ad031edb6e7fef94a.patch"; - sha256 = "1vjk7wy8ddkz9wjkiayag61gklrq59m7bwlaiyinjp4n15gx0j1k"; - }) - ]; + cargoSha256 = "0jkzy7ssg9v9phhlldq6s4rfs3sn17y2r1k0jr10g9j15lzixa04"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + doInstallCheck = true; + installCheckPhase = "$out/bin/jwt --version"; + meta = with stdenv.lib; { description = "Super fast CLI tool to decode and encode JWTs"; homepage = "https://github.com/mike-engel/jwt-cli"; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 752721689baa4..f1bb1f9d62d04 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -15,14 +15,14 @@ with stdenv.lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.24.0"; + version = "1.25.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "19zr2wlsc8rbw6a7vjy4ivgq71l34lh70pcgwa0k5sp1vryj7r3d"; + sha256 = "0wsgs0slqmj9q5prwlx7d4692lc4c42g0sv35r33vlxnfdwimfh5"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -76,7 +76,7 @@ in stdenv.mkDerivation rec { meta = { description = "Real-time performance monitoring tool"; - homepage = "https://my-netdata.io/"; + homepage = "https://www.netdata.cloud/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.lethalman ]; diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index c0a94457e6a87..ae9e29b6f1dc8 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -1,34 +1,64 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool -, pkgconfig, dbus, dbus-glib, libxml2, autoconf-archive }: +{ autoconf +, autoconf-archive +, automake +, dbus +, dbus-glib +, docbook_xml_dtd_412 +, docbook-xsl-nons +, fetchFromGitHub +, gtk-doc +, libevdev +, libtool +, libxml2 +, lzma +, pkgconfig +, stdenv +, upower +}: stdenv.mkDerivation rec { pname = "thermald"; - version = "2.2"; + version = "2.3"; + + outputs = [ "out" "devdoc" ]; src = fetchFromGitHub { owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "1nrhv3bypyc48h9smj5cpq63rawm6vqyg3cwkhpz69rgjnf1283m"; + sha256 = "0cisaca2c2z1x9xvxc4lr6nl6yqx5bww6brh73m0p1n643jgq1dl"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool dbus dbus-glib libxml2 autoconf-archive ]; - - patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; + nativeBuildInputs = [ + autoconf + autoconf-archive + automake + docbook-xsl-nons + docbook_xml_dtd_412 + gtk-doc + libtool + pkgconfig + ]; - preConfigure = '' - export PKG_CONFIG_PATH="${dbus.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" - ./autogen.sh - ''; + buildInputs = [ + dbus + dbus-glib + libevdev + libxml2 + lzma + upower + ]; configureFlags = [ "--sysconfdir=${placeholder "out"}/etc" "--localstatedir=/var" + "--enable-gtk-doc" "--with-dbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d" "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" ]; + preConfigure = "NO_CONFIGURE=1 ./autogen.sh"; + postInstall = '' cp ./data/thermal-conf.xml $out/etc/thermald/ ''; @@ -36,7 +66,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Thermal Daemon"; homepage = "https://01.org/linux-thermal-daemon"; - license = licenses.gpl2; + changelog = "https://github.com/intel/thermal_daemon/blob/master/README.txt"; + license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix index 95ef4f22b7763..9e02265e2dc06 100644 --- a/pkgs/tools/text/csvkit/default.nix +++ b/pkgs/tools/text/csvkit/default.nix @@ -1,44 +1,34 @@ -{ lib, python3, glibcLocales }: +{ lib, fetchpatch, python3 }: python3.pkgs.buildPythonApplication rec { pname = "csvkit"; - version = "1.0.4"; + version = "1.0.5"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1830lb95rh1iyi3drlwxzb6y3pqkii0qiyzd40c1kvhvaf1s6lqk"; + sha256 = "1ffmbzk4rxnl1yhqfl58v7kvl5m9cbvjm8v7xp4mvr00sgs91lvv"; }; + patches = [ + # Fixes a failing dbf related test. Won't be needed on 1.0.6 or later. + (fetchpatch{ + url = "https://github.com/wireservice/csvkit/commit/5f22e664121b13d9ff005a9206873a8f97431dca.patch"; + sha256 = "1kg00z65x7l6dnm5nfsr5krs8m7mv23hhb1inkaqf5m5fpkpnvv7"; + }) + ]; + propagatedBuildInputs = with python3.pkgs; [ agate agate-excel - # dbf test fail with agate-dbf-0.2.2 - (agate-dbf.overridePythonAttrs(old: rec { - version = "0.2.1"; - src = python3.pkgs.fetchPypi { - inherit (old) pname; - inherit version; - sha256 = "0brprva3vjypb5r9lk6zy10jazp681rxsqxzhz2lr869ir4krj80"; - };})) - # sql test fail with agate-sql-0.5.4 - (agate-sql.overridePythonAttrs(old: rec { - version = "0.5.3"; - src = python3.pkgs.fetchPypi { - inherit (old) pname; - inherit version; - sha256 = "1d6rbahmdix7xi7ma2v86fpk5yi32q5dba5vama35w5mmn2pnyw7"; - };})) + agate-dbf + agate-sql six ]; checkInputs = with python3.pkgs; [ - glibcLocales nose + nose pytestCheckHook ]; - checkPhase = '' - LC_ALL="en_US.UTF-8" nosetests -e test_csvsql - ''; - meta = with lib; { description = "A suite of command-line tools for converting to and working with CSV"; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index f875cc26311bd..7a01dc2ff0ad0 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -12,7 +12,6 @@ let exes = [ "asciidoctor" "asciidoctor-pdf" - "asciidoctor-safe" "asciidoctor-epub3" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0f21c24af678e..3337b66e9fb3c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -512,9 +512,11 @@ mapAliases ({ scim = sc-im; # added 2016-01-22 scollector = bosun; # added 2018-04-25 sdlmame = mame; # added 2019-10-30 + seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # added 2020-06-21 seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)"; shared_mime_info = shared-mime-info; # added 2018-02-25 skrooge2 = skrooge; # added 2017-02-18 + sky = throw "sky has been removed from nixpkgs (2020-09-16)"; skype = skypeforlinux; # added 2017-07-27 skydive = throw "skydive has been removed from nixpkgs (2019-09-10)"; slack-dark = slack; # added 2020-03-27 @@ -601,6 +603,7 @@ mapAliases ({ torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # added 2020-03-28 torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # added 2020-03-28 trang = jing-trang; # added 2018-04-25 + transcribe = throw "transcribe has been removed after being marked a broken for over a year"; # added 2020-09-16 transmission_gtk = transmission-gtk; # added 2018-01-06 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5c08075921ce..f2a608f4dff90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -962,6 +962,8 @@ in cozy = callPackage ../applications/audio/cozy-audiobooks { }; + cpuid = callPackage ../os-specific/linux/cpuid { }; + ctrtool = callPackage ../tools/archivers/ctrtool { }; crowbar = callPackage ../tools/security/crowbar { }; @@ -970,6 +972,8 @@ in crc32c = callPackage ../development/libraries/crc32c { }; + crcpp = callPackage ../development/libraries/crcpp { }; + cudd = callPackage ../development/libraries/cudd { }; cue = callPackage ../development/tools/cue { }; @@ -1256,6 +1260,7 @@ in axoloti = callPackage ../applications/audio/axoloti { gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; dfu-util-axoloti = callPackage ../applications/audio/axoloti/dfu-util.nix { }; libusb1-axoloti = callPackage ../applications/audio/axoloti/libusb1.nix { @@ -1263,7 +1268,10 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; - azureus = callPackage ../tools/networking/p2p/azureus { }; + azureus = callPackage ../tools/networking/p2p/azureus { + jdk = jdk8; + swt = swt_jdk8; + }; b3sum = callPackage ../tools/security/b3sum {}; @@ -1804,6 +1812,8 @@ in discount = callPackage ../tools/text/discount { }; + discocss = callPackage ../tools/misc/discocss { }; + disk-filltest = callPackage ../tools/system/disk-filltest { }; diskscan = callPackage ../tools/misc/diskscan { }; @@ -1945,6 +1955,8 @@ in filebench = callPackage ../tools/misc/filebench { }; + filebot = callPackage ../applications/video/filebot { }; + fileshare = callPackage ../servers/fileshare {}; fileshelter = callPackage ../servers/web-apps/fileshelter { }; @@ -1961,7 +1973,9 @@ in fsql = callPackage ../tools/misc/fsql { }; - fop = callPackage ../tools/typesetting/fop { }; + fop = callPackage ../tools/typesetting/fop { + jdk = openjdk8; + }; fondu = callPackage ../tools/misc/fondu { }; @@ -2552,7 +2566,7 @@ in biblatex-check = callPackage ../tools/typesetting/biblatex-check { }; birdfont = callPackage ../tools/misc/birdfont { }; - xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { }; + xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { stdenv = gccStdenv; }; blastem = callPackage ../misc/emulators/blastem { inherit (python27Packages) pillow; @@ -2756,6 +2770,7 @@ in collectd = callPackage ../tools/system/collectd { libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; collectd-data = callPackage ../tools/system/collectd/data.nix { }; @@ -3030,9 +3045,7 @@ in davfs2 = callPackage ../tools/filesystems/davfs2 { }; - dbeaver = callPackage ../applications/misc/dbeaver { - jdk = jdk11; - }; + dbeaver = callPackage ../applications/misc/dbeaver { }; dbench = callPackage ../development/tools/misc/dbench { }; @@ -3431,17 +3444,21 @@ in elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { utillinux = utillinuxMinimal; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix { enableUnfree = false; utillinux = utillinuxMinimal; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { utillinux = utillinuxMinimal; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix { enableUnfree = false; utillinux = utillinuxMinimal; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch = elasticsearch6; elasticsearch-oss = elasticsearch6-oss; @@ -3462,6 +3479,7 @@ in python = python3; }; + embree = callPackage ../development/libraries/embree { }; embree2 = callPackage ../development/libraries/embree/2.x.nix { }; emem = callPackage ../applications/misc/emem { }; @@ -3808,7 +3826,9 @@ in fusuma = callPackage ../tools/inputmethods/fusuma {}; - fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { }); + fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { + openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }); inherit (fdbPackages) foundationdb51 @@ -4369,11 +4389,11 @@ in })); hdfview = callPackage ../tools/misc/hdfview { - javac = jdk; + javac = jdk8; # TODO: https://github.com/NixOS/nixpkgs/pull/89731 }; hdf_java = callPackage ../tools/misc/hdfjava { - javac = jdk; + javac = jdk8; # TODO: https://github.com/NixOS/nixpkgs/pull/89731 }; hecate = callPackage ../applications/editors/hecate { }; @@ -4457,7 +4477,10 @@ in i2c-tools = callPackage ../os-specific/linux/i2c-tools { }; - i2p = callPackage ../tools/networking/i2p {}; + i2p = callPackage ../tools/networking/i2p { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; i2pd = callPackage ../tools/networking/i2pd { }; @@ -4655,7 +4678,9 @@ in jid = callPackage ../development/tools/jid { }; jing = res.jing-trang; - jing-trang = callPackage ../tools/text/xml/jing-trang { }; + jing-trang = callPackage ../tools/text/xml/jing-trang { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; jira-cli = callPackage ../development/tools/jira_cli { }; @@ -5450,6 +5475,8 @@ in microcom = callPackage ../applications/misc/microcom { }; + microserver = callPackage ../servers/microserver { }; + midisheetmusic = callPackage ../applications/audio/midisheetmusic { }; mikutter = callPackage ../applications/networking/instant-messengers/mikutter { }; @@ -6388,7 +6415,10 @@ in profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; - projectlibre = callPackage ../applications/misc/projectlibre { }; + projectlibre = callPackage ../applications/misc/projectlibre { + jre = jre8; + jdk = jdk8; + }; projectm = libsForQt5.callPackage ../applications/audio/projectm { }; @@ -6487,7 +6517,9 @@ in ucx = callPackage ../development/libraries/ucx {}; - openmodelica = callPackage ../applications/science/misc/openmodelica { }; + openmodelica = callPackage ../applications/science/misc/openmodelica { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; qarte = libsForQt514.callPackage ../applications/video/qarte { }; @@ -6743,9 +6775,7 @@ in rubocop = callPackage ../development/tools/rubocop { }; - runelite = callPackage ../games/runelite { - jre = openjdk11; - }; + runelite = callPackage ../games/runelite { }; runningx = callPackage ../tools/X11/runningx { }; @@ -8159,6 +8189,7 @@ in xtreemfs = callPackage ../tools/filesystems/xtreemfs { boost = boost165; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; xurls = callPackage ../tools/text/xurls {}; @@ -8373,7 +8404,10 @@ in ### DEVELOPMENT / COMPILERS - abcl = callPackage ../development/compilers/abcl {}; + abcl = callPackage ../development/compilers/abcl { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix; adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix; @@ -8453,6 +8487,7 @@ in avian = callPackage ../development/compilers/avian { inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; bigloo = callPackage ../development/compilers/bigloo { }; @@ -9162,6 +9197,11 @@ in else openjdk8.override { headless = true; }; + jdk8 = openjdk8; + jdk8_headless = openjdk8_headless; + jre8 = openjdk8.jre; + jre8_headless = openjdk8_headless.jre; + openjdk11-bootstrap = if adoptopenjdk-hotspot-bin-11.meta.available then adoptopenjdk-hotspot-bin-11 @@ -9202,7 +9242,10 @@ in }; }; - /* current JDK */ + jdk11 = openjdk11; + jdk11_headless = openjdk11_headless; + + /* Latest JDK */ openjdk14 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin { } @@ -9218,23 +9261,18 @@ in else openjdk14.override { headless = true; }; - openjdk = openjdk8; - openjdk_headless = openjdk8_headless; - - jdk8 = openjdk8; - jdk8_headless = openjdk8_headless; - jre8 = openjdk8.jre; - jre8_headless = openjdk8_headless.jre; - - jdk11 = openjdk11; - jdk11_headless = openjdk11_headless; - jdk14 = openjdk14; jdk14_headless = openjdk14_headless; - jdk = jdk8; - jre = jre8; - jre_headless = jre8_headless; + /* default JDK */ + + jdk = jdk14; + # jdk14 lacks a jre output. See https://github.com/NixOS/nixpkgs/issues/79490 + jre = jdk14; + jre_headless = jdk14_headless; + + openjdk = openjdk14; + openjdk_headless = openjdk14_headless; inherit (callPackages ../development/compilers/graalvm { gcc = if stdenv.targetPlatform.isDarwin then gcc8 else gcc; @@ -9278,7 +9316,9 @@ in jasmin = callPackage ../development/compilers/jasmin { }; - java-service-wrapper = callPackage ../tools/system/java-service-wrapper { }; + java-service-wrapper = callPackage ../tools/system/java-service-wrapper { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; @@ -9419,7 +9459,9 @@ in manticore = callPackage ../development/compilers/manticore { }; - mercury = callPackage ../development/compilers/mercury { }; + mercury = callPackage ../development/compilers/mercury { + jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; microscheme = callPackage ../development/compilers/microscheme { }; @@ -9474,6 +9516,7 @@ in mozart2 = callPackage ../development/compilers/mozart { emacs = emacs-nox; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { }; @@ -9720,7 +9763,10 @@ in metal = callPackage ../development/libraries/metal { }; metals = callPackage ../development/tools/metals { }; - scalafix = callPackage ../development/tools/scalafix { }; + scalafix = callPackage ../development/tools/scalafix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; scalafmt = callPackage ../development/tools/scalafmt { }; sdcc = callPackage ../development/compilers/sdcc { @@ -9762,6 +9808,7 @@ in swiProlog = callPackage ../development/compilers/swi-prolog { inherit (darwin.apple_sdk.frameworks) Security; + jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; swiPrologWithGui = swiProlog.override { withGui = true; }; @@ -9952,7 +9999,9 @@ in guile = guile_2_2; - inherit (callPackages ../applications/networking/cluster/hadoop { }) + inherit (callPackages ../applications/networking/cluster/hadoop { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }) hadoop_2_7 hadoop_2_8 hadoop_2_9 @@ -10059,15 +10108,18 @@ in octave = callPackage ../development/interpreters/octave { python = python3; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; octave-jit = callPackage ../development/interpreters/octave { python = python3; enableJIT = true; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; octaveFull = (lowPrio (libsForQt512.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 { }; @@ -10156,7 +10208,13 @@ in python2Packages = python2.pkgs; python3Packages = python3.pkgs; - pythonInterpreters = callPackage ./../development/interpreters/python {}; + pythonInterpreters = callPackage ./../development/interpreters/python { + # Overrides that apply to all Python interpreters + pkgs = pkgs // { + qt5 = pkgs.qt514; + libsForQt5 = pkgs.libsForQt514; + }; + }; inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36; # Python package sets. @@ -10424,7 +10482,9 @@ in adtool = callPackage ../tools/admin/adtool { }; - inherit (callPackage ../development/tools/alloy { }) + inherit (callPackage ../development/tools/alloy { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }) alloy4 alloy5 alloy; @@ -10441,13 +10501,21 @@ in ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; - antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; + antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { + jdk = jdk8; # todo: remove override https://github.com/nixos/nixpkgs/pull/89731 + }; - antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { }; - antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { }; + antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; + antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; antlr3 = antlr3_5; - antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { }; + antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; antlr4 = antlr4_7; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; @@ -10617,7 +10685,9 @@ in wxGTK = wxGTK30; }; - buck = callPackage ../development/tools/build-managers/buck { }; + buck = callPackage ../development/tools/build-managers/buck { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; buildkite-agent = buildkite-agent3; buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)"; @@ -10961,11 +11031,15 @@ in gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; - pmd = callPackage ../development/tools/analysis/pmd { }; + pmd = callPackage ../development/tools/analysis/pmd { + openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; pmdk = callPackage ../development/libraries/pmdk { }; - jdepend = callPackage ../development/tools/analysis/jdepend { }; + jdepend = callPackage ../development/tools/analysis/jdepend { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { }; @@ -10996,6 +11070,8 @@ in gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { }; + gnome-network-displays = callPackage ../applications/networking/gnome-network-displays { }; + gnome-multi-writer = callPackage ../applications/misc/gnome-multi-writer {}; gnome-online-accounts = callPackage ../development/libraries/gnome-online-accounts { }; @@ -11023,7 +11099,7 @@ in gputils = callPackage ../development/tools/misc/gputils { }; gradleGen = callPackage ../development/tools/build-managers/gradle { - java = jdk; + java = jdk8; # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 }; gradle = res.gradleGen.gradle_latest; gradle_4_10 = res.gradleGen.gradle_4_10; @@ -11202,7 +11278,9 @@ in massif-visualizer = libsForQt514.callPackage ../development/tools/analysis/massif-visualizer { }; maven = maven3; - maven3 = callPackage ../development/tools/build-managers/apache-maven { }; + maven3 = callPackage ../development/tools/build-managers/apache-maven { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { }; @@ -11871,6 +11949,7 @@ in belle-sip = callPackage ../development/libraries/belle-sip { stdenv = gcc8Stdenv; + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; libbfd = callPackage ../development/libraries/libbfd { }; @@ -12323,7 +12402,9 @@ in freeimage = callPackage ../development/libraries/freeimage { }; - freetts = callPackage ../development/libraries/freetts { }; + freetts = callPackage ../development/libraries/freetts { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; frog = res.languageMachines.frog; @@ -12386,7 +12467,9 @@ in gecode_6 = qt5.callPackage ../development/libraries/gecode { }; gecode = gecode_6; - gephi = callPackage ../applications/science/misc/gephi { }; + gephi = callPackage ../applications/science/misc/gephi { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; gegl = callPackage ../development/libraries/gegl { inherit (darwin.apple_sdk.frameworks) OpenGL; @@ -12845,8 +12928,6 @@ in herqq = libsForQt514.callPackage ../development/libraries/herqq { }; - heyefi = haskellPackages.heyefi; - hidapi = callPackage ../development/libraries/hidapi { }; highfive = callPackage ../development/libraries/highfive { }; @@ -13807,7 +13888,9 @@ in guile = guile_2_0; }; - libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { }; + libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; libmatroska = callPackage ../development/libraries/libmatroska { }; @@ -14559,7 +14642,9 @@ in openbabel = callPackage ../development/libraries/openbabel { }; - opencascade = callPackage ../development/libraries/opencascade { }; + opencascade = callPackage ../development/libraries/opencascade { + inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; + }; opencascade-occt = callPackage ../development/libraries/opencascade-occt { }; opencl-headers = callPackage ../development/libraries/opencl-headers { }; @@ -15070,7 +15155,10 @@ in range-v3 = callPackage ../development/libraries/range-v3 {}; - rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {}; + rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; rapidcheck = callPackage ../development/libraries/rapidcheck {}; @@ -15140,8 +15228,8 @@ in resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; rhino = callPackage ../development/libraries/java/rhino { - javac = jdk; - jvm = jre; + javac = jdk8; + jvm = jre8; }; rlog = callPackage ../development/libraries/rlog { }; @@ -15400,7 +15488,9 @@ in sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); - sqlite-analyzer = lowPrio (callPackage ../development/libraries/sqlite/analyzer.nix { }); + inherit (callPackage ../development/libraries/sqlite/tools.nix { + inherit (darwin.apple_sdk.frameworks) Foundation; + }) sqlite-analyzer sqldiff; sqlar = callPackage ../development/libraries/sqlite/sqlar.nix { }; @@ -15998,7 +16088,9 @@ in gwtwidgets = callPackage ../development/libraries/java/gwt-widgets { }; - javaCup = callPackage ../development/libraries/java/cup { }; + javaCup = callPackage ../development/libraries/java/cup { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; jdom = callPackage ../development/libraries/java/jdom { }; @@ -16029,6 +16121,9 @@ in smack = callPackage ../development/libraries/java/smack { }; swt = callPackage ../development/libraries/java/swt { }; + swt_jdk8 = callPackage ../development/libraries/java/swt { + jdk = jdk8; + }; ### DEVELOPMENT / LIBRARIES / JAVASCRIPT @@ -16138,6 +16233,7 @@ in withRecommendedPackages = false; inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; inherit (darwin) libobjc; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; rWrapper = callPackage ../development/r-modules/wrapper.nix { @@ -16222,18 +16318,26 @@ in cadvisor = callPackage ../servers/monitoring/cadvisor { }; - cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { }; - cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix { }; - cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { }; - cassandra_3_11 = callPackage ../servers/nosql/cassandra/3.11.nix { }; + cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; + cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; + cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; + cassandra_3_11 = callPackage ../servers/nosql/cassandra/3.11.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; cassandra = cassandra_3_11; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { - java = jdk; + java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; apache-jena-fuseki = callPackage ../servers/nosql/apache-jena/fuseki-binary.nix { - java = jdk; + java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; apcupsd = callPackage ../servers/apcupsd { }; @@ -16337,9 +16441,14 @@ in biboumi = callPackage ../servers/xmpp/biboumi { }; - elasticmq = callPackage ../servers/elasticmq { }; + elasticmq = callPackage ../servers/elasticmq { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; - elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { }; + elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; eventstore = callPackage ../servers/nosql/eventstore { Nuget = dotnetPackages.Nuget; @@ -17122,7 +17231,9 @@ in xinetd = callPackage ../servers/xinetd { }; - zookeeper = callPackage ../servers/zookeeper { }; + zookeeper = callPackage ../servers/zookeeper { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; @@ -17404,6 +17515,8 @@ in gmailctl = callPackage ../applications/networking/gmailctl {}; + gomp = callPackage ../applications/version-management/gomp { }; + gpm = callPackage ../servers/gpm { ncurses = null; # Keep curses disabled for lack of value }; @@ -20660,9 +20773,14 @@ in python3Packages = python37Packages; }; - freemind = callPackage ../applications/misc/freemind { }; + freemind = callPackage ../applications/misc/freemind { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; - freenet = callPackage ../applications/networking/p2p/freenet { }; + freenet = callPackage ../applications/networking/p2p/freenet { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix {}; @@ -21328,7 +21446,7 @@ in joe = callPackage ../applications/editors/joe { }; - josm = callPackage ../applications/misc/josm { jre = jdk11; }; + josm = callPackage ../applications/misc/josm { }; jwm = callPackage ../applications/window-managers/jwm { }; @@ -21609,6 +21727,7 @@ in (libreoffice-args // { icu = icu64; variant = "still"; + jdk = jdk8; }); }); libreoffice-still-unwrapped = libreoffice-still.libreoffice; @@ -21784,7 +21903,7 @@ in mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; - mediathekview = callPackage ../applications/video/mediathekview { jre = openjdk11; }; + mediathekview = callPackage ../applications/video/mediathekview { }; meteo = callPackage ../applications/networking/weather/meteo { }; @@ -22179,10 +22298,6 @@ in }; }; - sky = callPackage ../applications/networking/instant-messengers/sky { - qt5 = qt514; - }; - smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; smtube = libsForQt514.callPackage ../applications/video/smtube {}; @@ -22494,7 +22609,9 @@ in }; pdfcpu = callPackage ../applications/graphics/pdfcpu { }; - pdftk = callPackage ../tools/typesetting/pdftk { }; + pdftk = callPackage ../tools/typesetting/pdftk { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; pdftk-legacy = lowPrio (callPackage ../tools/typesetting/pdftk/legacy.nix { }); pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; @@ -22616,7 +22733,9 @@ in pommed_light = callPackage ../os-specific/linux/pommed-light {}; - polymake = callPackage ../applications/science/math/polymake { }; + polymake = callPackage ../applications/science/math/polymake { + openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; pond = callPackage ../applications/networking/instant-messengers/pond { }; @@ -22827,11 +22946,19 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; - qutebrowser = libsForQt515.callPackage ../applications/networking/browsers/qutebrowser { - python3Packages = python3Packages.override { - qt5 = qt515; - libsForQt5 = libsForQt515; + qutebrowser = let + libsForQt5 = libsForQt515; + qt5 = qt515; + python = python3.override { + packageOverrides = self: super: { + pkgs = pkgs // { + inherit libsForQt5 qt5; + }; + }; + self = python3; }; + in libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { + python3 = python; }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; @@ -22921,6 +23048,7 @@ in rstudio = libsForQt514.callPackage ../applications/editors/rstudio { boost = boost166; llvmPackages = llvmPackages_7; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {}); @@ -22956,6 +23084,8 @@ in sakura = callPackage ../applications/misc/sakura { }; + sameboy = callPackage ../misc/emulators/sameboy { }; + sayonara = libsForQt514.callPackage ../applications/audio/sayonara { }; sbagen = callPackage ../applications/misc/sbagen { }; @@ -22976,10 +23106,6 @@ in seafile-client = libsForQt514.callPackage ../applications/networking/seafile-client { }; - seeks = callPackage ../tools/networking/p2p/seeks { - protobuf = protobuf3_1; - }; - sent = callPackage ../applications/misc/sent { }; seq24 = callPackage ../applications/audio/seq24 { }; @@ -23084,8 +23210,13 @@ in linuxstopmotion = callPackage ../applications/video/linuxstopmotion { }; - sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { }) + sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }) // (callPackage ../applications/misc/sweethome3d/editors.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 sweethome3dApp = sweethome3d.application; }) ); @@ -23522,8 +23653,6 @@ in transcode = callPackage ../applications/audio/transcode { }; - transcribe = callPackage ../applications/audio/transcribe { }; - transmission = callPackage ../applications/networking/p2p/transmission { }; transmission-gtk = transmission.override { enableGTK3 = true; }; transmission-qt = transmission.override { enableQt = true; }; @@ -23710,6 +23839,7 @@ in virtualbox = libsForQt514.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; + jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; virtualboxHardened = lowPrio (virtualbox.override { @@ -23796,7 +23926,10 @@ in vue = callPackage ../applications/misc/vue { }; - vuze = callPackage ../applications/networking/p2p/vuze { }; + vuze = callPackage ../applications/networking/p2p/vuze { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; vwm = callPackage ../applications/window-managers/vwm { }; @@ -24099,11 +24232,19 @@ in gtk = gtk2; }; - kodiPlain = callPackage ../applications/video/kodi { }; + kodiPlain = callPackage ../applications/video/kodi { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; - kodiPlainWayland = callPackage ../applications/video/kodi { useWayland = true; }; + kodiPlainWayland = callPackage ../applications/video/kodi { + useWayland = true; + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; - kodiGBM = callPackage ../applications/video/kodi { useGbm = true; }; + kodiGBM = callPackage ../applications/video/kodi { + useGbm = true; + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); @@ -25634,7 +25775,9 @@ in gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; - jmol = callPackage ../applications/science/chemistry/jmol { }; + jmol = callPackage ../applications/science/chemistry/jmol { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; marvin = callPackage ../applications/science/chemistry/marvin { }; @@ -26124,7 +26267,9 @@ in cvc3 = callPackage ../applications/science/logic/cvc3 { gmp = lib.overrideDerivation gmp (a: { dontDisableStatic = true; }); }; - cvc4 = callPackage ../applications/science/logic/cvc4 {}; + cvc4 = callPackage ../applications/science/logic/cvc4 { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; drat-trim = callPackage ../applications/science/logic/drat-trim {}; @@ -26258,7 +26403,9 @@ in z3 = callPackage ../applications/science/logic/z3 { python = python2; }; z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix {}; - tlaplus = callPackage ../applications/science/logic/tlaplus {}; + tlaplus = callPackage ../applications/science/logic/tlaplus { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; @@ -26579,7 +26726,11 @@ in auctex = callPackage ../tools/typesetting/tex/auctex { }; - areca = callPackage ../applications/backup/areca { }; + areca = callPackage ../applications/backup/areca { + jdk = jdk8; + jre = jre8; + swt = swt_jdk8; + }; attract-mode = callPackage ../misc/emulators/attract-mode { }; @@ -27155,6 +27306,7 @@ in gdal = gdal.override {libmysqlclient = mysql // {lib = {dev = mysql;};};}; mysql = mysql; pcre = pcre-cpp; + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }); r128gain = callPackage ../applications/audio/r128gain { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dcdb0e699d6fb..f1c9da714bad5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10230,7 +10230,8 @@ let propagatedBuildInputs = [ Inline ]; - makeMakerFlags = "J2SDK=${pkgs.jdk}"; + # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 + makeMakerFlags = "J2SDK=${pkgs.jdk8}"; # FIXME: Apparently tests want to access the network. doCheck = false; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09d9f1f53a058..03b751ae28812 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9,8 +9,6 @@ { pkgs , stdenv , python -, qt5 -, libsForQt5 , overrides ? (self: super: {}) }: @@ -1313,6 +1311,8 @@ in { crashtest = callPackage ../development/python-modules/crashtest { }; + crate = callPackage ../development/python-modules/crate { }; + crayons = callPackage ../development/python-modules/crayons { }; crc16 = callPackage ../development/python-modules/crc16 { }; @@ -2766,6 +2766,8 @@ in { hypothesis = if isPy3k then callPackage ../development/python-modules/hypothesis { } else self.hypothesis_4; + hyppo = callPackage ../development/python-modules/hyppo { }; + i3ipc = callPackage ../development/python-modules/i3ipc { }; i3-py = callPackage ../development/python-modules/i3-py { }; @@ -3595,7 +3597,7 @@ in { maya = callPackage ../development/python-modules/maya { }; - mayavi = libsForQt5.callPackage ../development/python-modules/mayavi { + mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { inherit buildPythonPackage isPy27 fetchPypi; inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5; }; @@ -4034,6 +4036,8 @@ in { nplusone = callPackage ../development/python-modules/nplusone { }; + ntc-templates = callPackage ../development/python-modules/ntc-templates { }; + ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; ntplib = callPackage ../development/python-modules/ntplib { }; @@ -4185,7 +4189,7 @@ in { ovh = callPackage ../development/python-modules/ovh { }; - ovito = toPythonModule (libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); + ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); owslib = callPackage ../development/python-modules/owslib { }; @@ -4437,8 +4441,8 @@ in { pipx = callPackage ../development/python-modules/pipx { }; pivy = callPackage ../development/python-modules/pivy { - inherit (qt5) qtbase qmake; - inherit (libsForQt5) soqt; + inherit (pkgs.qt5) qtbase qmake; + inherit (pkgs.libsForQt5) soqt; }; pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; }; @@ -4510,8 +4514,8 @@ in { pooch = callPackage ../development/python-modules/pooch { }; poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { - inherit (qt5) qtbase; - inherit (libsForQt5) poppler; + inherit (pkgs.qt5) qtbase; + inherit (pkgs.libsForQt5) poppler; inherit (pkgs) pkgconfig; }; @@ -5216,7 +5220,7 @@ in { pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; - pyqt5 = libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; + pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; @@ -5229,7 +5233,7 @@ in { pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; - pyqtwebengine = libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; + pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; pyquery = callPackage ../development/python-modules/pyquery { }; @@ -5335,9 +5339,9 @@ in { pyshp = callPackage ../development/python-modules/pyshp { }; pyside2-tools = - toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake; inherit qt5; }); + toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake qt5; }); - pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake ninja; inherit qt5; }); + pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake ninja qt5; }); pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; @@ -5379,6 +5383,8 @@ in { pyspf = callPackage ../development/python-modules/pyspf { }; + pyspice = callPackage ../development/python-modules/pyspice { }; + pyspinel = callPackage ../development/python-modules/pyspinel { }; pyspotify = callPackage ../development/python-modules/pyspotify { }; @@ -5938,7 +5944,7 @@ in { qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { }; - qscintilla-qt5 = libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; + qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; qscintilla = self.qscintilla-qt4; @@ -6119,7 +6125,7 @@ in { roboschool = callPackage ../development/python-modules/roboschool { inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package - inherit (qt5) qtbase; + inherit (pkgs.qt5) qtbase; }; robot-detection = callPackage ../development/python-modules/robot-detection { }; @@ -6405,7 +6411,7 @@ in { shellingham = callPackage ../development/python-modules/shellingham { }; shiboken2 = - toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages; inherit qt5; }); + toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages qt5; }); shippai = callPackage ../development/python-modules/shippai { }; @@ -6461,7 +6467,9 @@ in { six = callPackage ../development/python-modules/six { }; - skein = callPackage ../development/python-modules/skein { }; + skein = callPackage ../development/python-modules/skein { + jre = pkgs.jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; @@ -6923,6 +6931,8 @@ in { testfixtures = callPackage ../development/python-modules/testfixtures { }; + textfsm = callPackage ../development/python-modules/textfsm { }; + testpath = callPackage ../development/python-modules/testpath { }; testrepository = callPackage ../development/python-modules/testrepository { }; @@ -7571,6 +7581,8 @@ in { yamllint = callPackage ../development/python-modules/yamllint { }; + yamlordereddictloader = callPackage ../development/python-modules/yamlordereddictloader { }; + yanc = callPackage ../development/python-modules/yanc { }; yapf = callPackage ../development/python-modules/yapf { }; |