diff options
Diffstat (limited to 'pkgs')
126 files changed, 2191 insertions, 563 deletions
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/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/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix new file mode 100644 index 0000000000000..25caf4b7ac7f8 --- /dev/null +++ b/pkgs/applications/editors/bluej/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, makeWrapper, jdk }: + +stdenv.mkDerivation rec { + pname = "bluej"; + version = "4.2.2"; + src = fetchurl { + # We use the deb here. First instinct might be to go for the "generic" JAR + # download, but that is actually a graphical installer that is much harder + # to unpack than the deb. + url = "https://www.bluej.org/download/files/BlueJ-linux-${builtins.replaceStrings ["."] [""] version}.deb"; + sha256 = "5c2241f2208e98fcf9aad7c7a282bcf16e6fd543faa5fdb0b99b34d1023113c3"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + unpackPhase = '' + ar xf $src + tar xf data.tar.xz + ''; + + installPhase = '' + mkdir -p $out + cp -r usr/* $out + + makeWrapper ${jdk}/bin/java $out/bin/bluej \ + --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp \"$out/share/bluej/bluej.jar\" bluej.Boot" + ''; + + meta = with stdenv.lib; { + description = "A simple integrated development environment for Java"; + homepage = "https://www.bluej.org/"; + license = licenses.gpl2ClasspathPlus; + maintainers = [ maintainers.charvp ]; + platforms = platforms.unix; + }; +} 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/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/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix index 99ca119b3bcd3..3c67b11844d07 100644 --- a/pkgs/applications/graphics/fontmatrix/default.nix +++ b/pkgs/applications/graphics/fontmatrix/default.nix @@ -1,26 +1,32 @@ -{ stdenv, fetchFromGitHub, cmake, qt4 }: +{ lib, mkDerivation, fetchpatch, fetchFromGitHub, cmake, qttools, qtwebkit }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "fontmatrix"; - version = "0.6.0"; + version = "0.6.0-qt5"; src = fetchFromGitHub { - owner = "fontmatrix"; + owner = "fcoiffie"; repo = "fontmatrix"; - rev = "v${version}"; - sha256 = "0aqndj1jhm6hjpwmj1qm92z2ljh7w78a5ff5ag47qywqha1ngn05"; + rev = "1ff8382d8c85c18d9962918f461341ff4fe21993"; + sha256 = "0yx1gbsjj9ddq1kiqplif1w5x5saw250zbmhmd4phqmaqzr60w0h"; }; - buildInputs = [ qt4 ]; + # Add missing QAction include + patches = [ (fetchpatch { + url = "https://github.com/fcoiffie/fontmatrix/commit/dc6de8c414ae21516b72daead79c8db88309b102.patch"; + sha256 = "092860fdyf5gq67jqfxnlgwzjgpizi6j0njjv3m62aiznrhig7c8"; + })]; + + buildInputs = [ qttools qtwebkit ]; nativeBuildInputs = [ cmake ]; hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; homepage = "https://github.com/fontmatrix/fontmatrix"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index ef634fcf72bc3..db82aea2a5083 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.14.5"; + version = "1.15.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "03xkrmwk4bvkqai9ghdm5arw9i4zhnfbabdn99lr1cv5prq7m4p3"; + sha256 = "1g9hmb5637x8bhm2wzarqnxzj0i93fcdm1myvld2d97a2d32hy6m"; }; doCheck = false; 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/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/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/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix index 4d537f8dd4c8f..421d6bb745a05 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ b/pkgs/applications/networking/browsers/ungoogled-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 @@ -52,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; 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/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/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/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/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/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index d068fb7316958..2946f7cd5014c 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -112,7 +112,7 @@ let git-ignore = callPackage ./git-ignore { }; - git-imerge = callPackage ./git-imerge { }; + git-imerge = python3Packages.callPackage ./git-imerge { }; git-interactive-rebase-tool = callPackage ./git-interactive-rebase-tool { inherit (darwin.apple_sdk.frameworks) Security; diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix index 721a7784e9ca7..e1caede77d8e1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix @@ -1,25 +1,24 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, buildPythonApplication, fetchPypi, installShellFiles }: -stdenv.mkDerivation rec { +buildPythonApplication rec { pname = "git-imerge"; - version = "1.1.0"; + version = "1.2.0"; - src = fetchFromGitHub { - owner = "mhagger"; - repo = "git-imerge"; - rev = "v${version}"; - sha256 = "0vi1w3f0yk4gqhxj2hzqafqq28rihyhyfnp8x7xzib96j2si14a4"; + src = fetchPypi { + inherit pname version; + sha256 = "df5818f40164b916eb089a004a47e5b8febae2b4471a827e3aaa4ebec3831a3f"; }; - buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; + nativeBuildInputs = [ installShellFiles ]; - makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ] ; - - meta = with stdenv.lib; { + postInstall = '' + installShellCompletion --bash completions/git-imerge + ''; + + meta = with lib; { homepage = "https://github.com/mhagger/git-imerge"; description = "Perform a merge between two branches incrementally"; - license = licenses.gpl2; - platforms = platforms.all; + license = licenses.gpl2Plus; maintainers = [ maintainers.spwhitt ]; }; } 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 2e1c790348e15..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.5"; + version = "2.15.6"; src = fetchPypi { inherit pname version; - sha256 = "11an0hwva1jlf9y7vd9mscs4g6lzja1rwizsani6411xs6m121a3"; + 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/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/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/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 0c1569145e6a7..2f2d66f3b2f52 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -18,11 +18,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "16sd08bfa2b1qgpnd3q6k7glw0w1wyrqyf47fz2220yafrryrmyz"; + sha256 = "1zd29s8lggv4x5xracgzywayg1skl9qc2bqh1zdxh1wrg9sqbadi"; }; goPackagePath = "github.com/sylabs/singularity"; 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/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/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/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/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/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/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/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index 1b2d83b84d0a3..956538b762409 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses ? null, perl ? null }: +{ stdenv, fetchurl, ncurses ? null, perl ? null, lib }: stdenv.mkDerivation rec { name = "liboping-1.10.0"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + NIX_CFLAGS_COMPILE = lib.optionalString + stdenv.cc.isGNU "-Wno-error=format-truncation"; buildInputs = [ ncurses perl ]; 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/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 a780d3cc9675c..6a4affb915f8b 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -199,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 1dbe9ac6e2648..201deab6607f5 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -4045,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"; @@ -4198,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"; @@ -5125,76 +5143,76 @@ let sha512 = "4Lpf59lr0pycIzKdTlZsgubJxCHDkAqcc4I60Gp6rggueksuhz2q3rAp7kfxwCzaZlAXXsqy6hoeyj+3sukqDQ=="; }; }; - "@vue/compiler-core-3.0.0-rc.13" = { + "@vue/compiler-core-3.0.0" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.0.0-rc.13"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.0-rc.13.tgz"; - sha512 = "bVtg7iilAE8uq+WvR4JN+vtzQWX+yjKHNG5Un0ar6M9WbphydGY9C0y1whKjRbKn/7U+evUh1MJ2hV2q3GBrSQ=="; + 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.13" = { + "@vue/compiler-dom-3.0.0" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.0.0-rc.13"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.0-rc.13.tgz"; - sha512 = "D0x6cZFiDfz+rcmWSgvgxjhVQOADMmQy7kcbft3u5nlTurZaztBNBz7pwHYi57/z3FjhzyclpDf0daOrRvph4A=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.0.tgz"; + sha512 = "ukDEGOP8P7lCPyStuM3F2iD5w2QPgUu2xwCW2XNeqPjFKIlR2xMsWjy4raI/cLjN6W16GtlMFaZdK8tLj5PRog=="; }; }; - "@vue/compiler-sfc-3.0.0-rc.13" = { + "@vue/compiler-sfc-3.0.0" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.0.0-rc.13"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.0-rc.13.tgz"; - sha512 = "b98HQgq1dEWqWUzUFMnGxeRpuOfbehCCWbT6+cH+SARNVwUi+/5UPHLxJ58GyXlyy6hMY6IDr6TUmGPG1aXV7A=="; + 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.13" = { + "@vue/compiler-ssr-3.0.0" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.0.0-rc.13"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.0-rc.13.tgz"; - sha512 = "BEVx2BXMJwzpmNI63YDtEMLdnLysMHbBwrapXiX421FwEAL8gwHE0rTc9WgcresegEmDuCmZTi/LnwcEooO+8Q=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.0.tgz"; + sha512 = "Er41F9ZFyKB3YnNbE6JSTIGCVWve3NAQimgDOk4uP42OnckxBYKGBTutDeFNeqUZBMu/9vRHYrxlGFC9Z5jBVQ=="; }; }; - "@vue/reactivity-3.0.0-rc.13" = { + "@vue/reactivity-3.0.0" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.0.0-rc.13"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.0-rc.13.tgz"; - sha512 = "I4E9/3ZGejuNfUbpbgtWWDGas3qIGqqvjUeMEuDGbJfaUluZauSKXPRKjfGPz+esmgwvGAWjkcFeyyiYY4RSNQ=="; + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.0.tgz"; + sha512 = "mEGkztGQrAPZRhV7C6PorrpT3+NtuA4dY2QjMzzrW31noKhssWTajRZTwpLF39NBRrF5UU6cp9+1I0FfavMgEQ=="; }; }; - "@vue/runtime-core-3.0.0-rc.13" = { + "@vue/runtime-core-3.0.0" = { name = "_at_vue_slash_runtime-core"; packageName = "@vue/runtime-core"; - version = "3.0.0-rc.13"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.0-rc.13.tgz"; - sha512 = "N5xGV6s/LaXybNt81XdBdil6exMoI1HPd0FeURnmhHfUizI41xq4yrWO+Yi44XO+R8xFcfxYECBaPqk0jPLgsg=="; + 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.13" = { + "@vue/runtime-dom-3.0.0" = { name = "_at_vue_slash_runtime-dom"; packageName = "@vue/runtime-dom"; - version = "3.0.0-rc.13"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.0-rc.13.tgz"; - sha512 = "o3Y9qlS3w8gqaj/vc99Z0DA2yETQFH8Q+qvxZstvRTEOYGEzxualIkBpCBXkPEXVSaing3Gbd4wso764RUZjkQ=="; + 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.13" = { + "@vue/shared-3.0.0" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.0.0-rc.13"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.0-rc.13.tgz"; - sha512 = "8zEVHmffW1P8Wlt8P63N+zKJrmzL6y0P2P6biWdl4CI9E5QVKlbOEYl7i+tU/dpa6oLj6nEzBxUCwA7UHvcPkw=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.0.tgz"; + sha512 = "4XWL/avABGxU2E2ZF1eZq3Tj7fvksCMssDZUHOykBIMmh5d+KcAnQMC5XHMhtnA0NAvktYsA2YpdsVwVmhWzvA=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -8194,13 +8212,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.755.0" = { + "aws-sdk-2.756.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.755.0"; + version = "2.756.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.755.0.tgz"; - sha512 = "APei6/d3ki6wi9pp6XvQ7QTiOhDBCo1qCOQZ5n8POUE1yrB7/6SNWami9OTj2TavFvnz7OuPr5YZ2/Ra45N49A=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.756.0.tgz"; + sha512 = "Hk6DzcsXq1WRg+UVHDH56iQz31kDtg/NRqtJL1A0BrZ/PtNSLTHsQQllpcAi09UxLDMzBoDXymZ8kYg0Migq8w=="; }; }; "aws-sign2-0.6.0" = { @@ -10669,6 +10687,15 @@ let 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" = { name = "capital-case"; packageName = "capital-case"; @@ -14288,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"; @@ -15179,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"; @@ -26171,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"; @@ -33473,15 +33680,6 @@ let sha512 = "LP5F1dhjULEJV5oGRg6ROztH2FddzttrrUEwq5J2GB2Zy938mg0vwt1+Rthn/qqDHtj4Qgq21duNGHh+Ew1wUg=="; }; }; - "oas-resolver-2.4.4" = { - name = "oas-resolver"; - packageName = "oas-resolver"; - version = "2.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.4.4.tgz"; - sha512 = "670+SM5CXYrjI547cgUeQTdB1wJb2gyrJ7bnGywQMrmciKXhXj/EFbE/8c8wed+j1WmGAh7xS+QdQxiuIlNqlw=="; - }; - }; "oas-resolver-2.5.0" = { name = "oas-resolver"; packageName = "oas-resolver"; @@ -40171,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" = { @@ -41287,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"; @@ -42043,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"; @@ -45823,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" = { @@ -45913,13 +46129,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.27.4" = { + "systeminformation-4.27.5" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.27.4"; + version = "4.27.5"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.4.tgz"; - sha512 = "VlFlxbkvSddq16F/nHC0GRaKBZOKWbAuRbck4G9muHhCUcDKskhNkVbaBBFxxqwcp0IyVozLS96eAVmkRZTG4w=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.5.tgz"; + sha512 = "EysogxKqREk54ZYDEFcsCODv8GymKZcyiSfegYit8dKhPjzuQr+KX4GFHjssWjYrWFEIM2bYNsFrZX5eufeAXg=="; }; }; "syswide-cas-5.3.0" = { @@ -47138,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"; @@ -47939,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" = { @@ -49649,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"; @@ -50396,13 +50882,13 @@ let sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; }; }; - "vue-3.0.0-rc.13" = { + "vue-3.0.0" = { name = "vue"; packageName = "vue"; - version = "3.0.0-rc.13"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-3.0.0-rc.13.tgz"; - sha512 = "xCW8EAVSMdU7z+3BWBFV9hO36Tg6vN25fYN6agC6/z/3JlAyo0hVqQtqmGaDAHVlO110rPowfkGIWqStPhTdcw=="; + url = "https://registry.npmjs.org/vue/-/vue-3.0.0.tgz"; + sha512 = "ZMrAARZ32sGIaYKr7Fk2GZEBh/VhulSrGxcGBiAvbN4fhjl3tuJyNFbbbLFqGjndbLoBW66I2ECq8ICdvkKdJw=="; }; }; "vue-cli-plugin-apollo-0.21.3" = { @@ -54417,24 +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.13" // { + (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.13" - (sources."@vue/compiler-sfc-3.0.0-rc.13" // { + 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.13" - sources."@vue/reactivity-3.0.0-rc.13" - sources."@vue/runtime-core-3.0.0-rc.13" - sources."@vue/runtime-dom-3.0.0-rc.13" - sources."@vue/shared-3.0.0-rc.13" + 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" @@ -55863,7 +56349,7 @@ in (sources."vue-codemod-0.0.4" // { dependencies = [ sources."globby-10.0.2" - sources."vue-3.0.0-rc.13" + sources."vue-3.0.0" ]; }) sources."watch-1.0.2" @@ -58631,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" @@ -60371,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 = [ @@ -61169,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.4" + sources."systeminformation-4.27.5" sources."term-size-2.2.0" sources."through-2.3.8" sources."tmp-0.2.1" @@ -62695,7 +63181,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.755.0" + sources."aws-sdk-2.756.0" sources."aws-sign2-0.7.0" sources."aws4-1.10.1" sources."base64-js-1.3.1" @@ -66690,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" @@ -67228,7 +67714,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.27.4" + sources."systeminformation-4.27.5" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -69345,7 +69831,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.755.0" // { + (sources."aws-sdk-2.756.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -75082,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" @@ -75791,7 +76277,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.755.0" // { + (sources."aws-sdk-2.756.0" // { dependencies = [ sources."buffer-4.9.2" sources."uuid-3.3.2" @@ -81823,10 +82309,10 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.14.1"; + version = "0.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.14.1.tgz"; - sha512 = "8UGSiSRXw2I8grlN2mbu7WuJbekZiPKWqbB2/nRzg+ifdB7gxKFs7G4J+GPxHNOqJdMIuuXFbu8OdzmVzx8R0g=="; + 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" @@ -83303,7 +83789,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.755.0" // { + (sources."aws-sdk-2.756.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -86338,7 +86824,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.755.0" // { + (sources."aws-sdk-2.756.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -88552,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 = [ @@ -89978,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 = { @@ -90372,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"; @@ -94165,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" @@ -94252,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" @@ -94624,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" diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index 7dc87194d6a5b..0da1ab74e199e 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-apron-${version}"; - version = "0.9.12"; + version = "0.9.13"; src = fetchFromGitHub { owner = "antoinemine"; repo = "apron"; rev = "v${version}"; - sha256 = "0bciv4wz52p57q0aggmvixvqrsd1slflfyrm1z6fy5c44f4fmjjn"; + sha256 = "14ymjahqdxj26da8wik9d5dzlxn81b3z1iggdl7rn2nn06jy7lvy"; }; buildInputs = [ perl gmp mpfr ppl ocaml findlib camlidl ]; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 1123cc0d2b4e9..f9996eb6af629 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -6,9 +6,9 @@ let source = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.9"; - url = "https://github.com/ocaml/Zarith/archive/release-1.9.tar.gz"; - sha256 = "1xrqcaj5gp52xp4ybpnblw8ciwlgrr0zi7rg7hnk8x83isjkpmwx"; + version = "1.10"; + url = "https://github.com/ocaml/Zarith/archive/release-1.10.tar.gz"; + sha256 = "1qxrl0v2mk9wghc1iix3n0vfz2jbg6k5wpn1z7p02m2sqskb0zhb"; } else { version = "1.3"; url = "http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz"; 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/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix new file mode 100644 index 0000000000000..7dfce0d75c523 --- /dev/null +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, isPy27, pytestCheckHook +, requests, arrow, logfury, tqdm }: + +buildPythonPackage rec { + pname = "b2sdk"; + version = "1.1.4"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0g527qdda105r5g9yjh4lxzlmz34m2bdz8dydqqy09igdsmiyi9j"; + }; + + pythonImportsCheck = [ "b2sdk" ]; + + nativebuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ requests arrow logfury tqdm ]; + + # requires unpackaged dependencies like liccheck + doCheck = false; + + meta = with stdenv.lib; { + description = "Client library and utilities for access to B2 Cloud Storage (backblaze)."; + homepage = "https://github.com/Backblaze/b2-sdk-python"; + license = licenses.mit; + }; +} 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/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/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/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/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/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/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/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/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/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/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/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index 4de6e54cd5fb4..29264b4f61d34 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -34,9 +34,6 @@ buildPythonApplication rec { preFixup = '' gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH") - # gdk-pixbuf setup hook can not choose between propagated librsvg - # and our librsvg with GObject introspection. - GDK_PIXBUF_MODULE_FILE=$(echo ${librsvg}/lib/gdk-pixbuf-2.0/*/loaders.cache) ''; postFixup = '' 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/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/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix index 7a1c2d1cec96f..5f10189692127 100644 --- a/pkgs/os-specific/linux/xpadneo/default.nix +++ b/pkgs/os-specific/linux/xpadneo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xpadneo"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "atar-axis"; repo = pname; rev = "v${version}"; - sha256 = "0v688j7jx2b68zlwnrr5y63zxzhldygw1lcp8f3irayhcp8ikzzy"; + sha256 = "1g3ml7vq0dzwl9815c3l0i0qz3a7v8c376c6dqbfkbj2f1d43vqs"; }; setSourceRoot = '' 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/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 3758505edbad4..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.2"; + version = "1.19.3"; src = fetchPypi { inherit pname version; - sha256 = "0q2w3aid6xsn1ibpsl3wf6m7vl0znngz8n717rx1jndz4s6014nj"; + sha256 = "1r63gw9a4n2sd3520zadpn05zxfk45nqrgwxp3zky5nkyrh4qbys"; }; patches = [ 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/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/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/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 776eca9999891..56551891a4a5f 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -31,6 +31,7 @@ , enableAlternatives ? false , enableCheck ? false, liboggz ? null , enableCopyArtifacts ? false +, enableExtraFiles ? false , bashInteractive, bash-completion }: @@ -100,6 +101,7 @@ let externalTestArgs.beets = (beets.override { enableAlternatives = false; enableCopyArtifacts = false; + enableExtraFiles = false; }).overrideAttrs (stdenv.lib.const { doInstallCheck = false; }); @@ -110,6 +112,7 @@ let alternatives = callPackage ./alternatives-plugin.nix pluginArgs; check = callPackage ./check-plugin.nix pluginArgs; copyartifacts = callPackage ./copyartifacts-plugin.nix pluginArgs; + extrafiles = callPackage ./extrafiles-plugin.nix pluginArgs; }; in pythonPackages.buildPythonApplication rec { @@ -156,7 +159,9 @@ in pythonPackages.buildPythonApplication rec { ++ optional enableThumbnails pythonPackages.pyxdg ++ optional enableWeb pythonPackages.flask ++ optional enableAlternatives plugins.alternatives - ++ optional enableCopyArtifacts plugins.copyartifacts; + ++ optional enableCopyArtifacts plugins.copyartifacts + ++ optional enableExtraFiles plugins.extrafiles + ; buildInputs = [ imagemagick diff --git a/pkgs/tools/audio/beets/extrafiles-plugin.nix b/pkgs/tools/audio/beets/extrafiles-plugin.nix new file mode 100644 index 0000000000000..7d0e446ce6051 --- /dev/null +++ b/pkgs/tools/audio/beets/extrafiles-plugin.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, beets, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + pname = "beets-extrafiles"; + version = "0.0.7"; + + src = fetchFromGitHub { + repo = "beets-extrafiles"; + owner = "Holzhaus"; + rev = "v${version}"; + sha256 = "0ah7mgax9zrhvvd5scf2z0v0bhd6xmmv5sdb6av840ixpl6vlvm6"; + }; + + postPatch = '' + sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py + sed -i -e '/namespace_packages/d' setup.py + ''; + + nativeBuildInputs = [ beets ]; + + preCheck = '' + HOME=$TEMPDIR + ''; + + meta = { + homepage = "https://github.com/Holzhaus/beets-extrafiles"; + description = "A plugin for beets that copies additional files and directories during the import process"; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 6d6da3c98749f..c12cc1198c9cf 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -46,9 +46,8 @@ pythonPackages.buildPythonApplication rec { librsync ]; - propagatedBuildInputs = [ - backblaze-b2 - ] ++ (with pythonPackages; [ + propagatedBuildInputs = with pythonPackages; [ + b2sdk boto cffi cryptography @@ -65,7 +64,7 @@ pythonPackages.buildPythonApplication rec { future ] ++ stdenv.lib.optionals (!isPy3k) [ enum - ]); + ]; checkInputs = [ gnupg # Add 'gpg' to PATH. diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index 3ae898d4ba8a7..e2cb603ca3d53 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -47,6 +47,12 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/debian/lizardfs/raw/bfcd5bcf/debian/patches/spdlog.patch"; sha256 = "0j44rb816i6kfh3y2qdha59c4ja6wmcnlrlq29il4ybxn42914md"; }) + # Fix https://github.com/lizardfs/lizardfs/issues/655 + # (Remove upon update to 3.13) + (fetchpatch { + url = "https://github.com/lizardfs/lizardfs/commit/5d20c95179be09241b039050bceda3c46980c004.patch"; + sha256 = "185bfcz2rjr4cnxld2yc2nxwzz0rk4x1fl1sd25g8gr5advllmdv"; + }) ]; meta = with stdenv.lib; { 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/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/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/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/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index e9e09e8cdffe6..9726cde61e540 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.8.17"; + version = "1.8.18"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "1fl23q4hccwdapknj7yd8294jil15758k1r6ljbms2gijlly9lg3"; + sha256 = "1kxf0qcyg5mhddrzwv0hd1fy901wl0ydmxi6b1k2217xmgiyi2s6"; }; - cargoSha256 = "0jgzh9p6ziq3337461cj4fkbghks3bq8dnrn6ab8dkynjwvd47bx"; + cargoSha256 = "0vmd4sjagyhrc7q7fszwcjh4nhhmhckmx48i1h2xhr68bwncmyif"; SODIUM_USE_PKG_CONFIG = 1; 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/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index cd9ec7c7082d2..59636fb5dc809 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, nvidia_x11, cudatoolkit, ncurses }: +{ stdenv, fetchFromGitHub, cmake, cudatoolkit, ncurses, addOpenGLRunpath }: stdenv.mkDerivation rec { pname = "nvtop"; @@ -6,22 +6,26 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Syllo"; - repo = "nvtop"; + repo = "nvtop"; rev = version; sha256 = "1b6yz54xddip1r0k8cbqg41dpyhds18fj29bj3yf40xvysklb0f4"; }; cmakeFlags = [ "-DNVML_INCLUDE_DIRS=${cudatoolkit}/include" - "-DNVML_LIBRARIES=${nvidia_x11}/lib/libnvidia-ml.so" + "-DNVML_LIBRARIES=${cudatoolkit}/targets/x86_64-linux/lib/stubs/libnvidia-ml.so" "-DCMAKE_BUILD_TYPE=Release" ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ ncurses nvidia_x11 cudatoolkit ]; + nativeBuildInputs = [ cmake addOpenGLRunpath ]; + buildInputs = [ ncurses cudatoolkit ]; + + postFixup = '' + addOpenGLRunpath $out/bin/nvtop + ''; meta = with stdenv.lib; { - description = "A (h)top like like task monitor for NVIDIA GPUs"; + description = "A (h)top like task monitor for NVIDIA GPUs"; homepage = "https://github.com/Syllo/nvtop"; license = licenses.gpl3; platforms = platforms.linux; 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/tools/video/untrunc/default.nix b/pkgs/tools/video/untrunc/default.nix index 728b4ff01188a..1918f4e597456 100644 --- a/pkgs/tools/video/untrunc/default.nix +++ b/pkgs/tools/video/untrunc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "untrunc"; - version = "2018.01.13"; + version = "2020.02.09"; src = fetchFromGitHub { owner = "ponchio"; repo = "untrunc"; - rev = "3a2e6d0718faf06589f7b9d95c8f966348e537f7"; - sha256 = "03ka4lr69k7mikfpcpd95smzdj62v851ididnjyps5a0j06f8087"; + rev = "4eed44283168c727ace839ff7590092fda2e0848"; + sha256 = "0nfj67drc6bxqlkf8a1iazqhi0w38a7rjrb2bpa74gwq6xzygvbr"; }; buildInputs = [ gcc libav_12 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc7adf5066d47..025fbab5a67ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1260,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 { @@ -1267,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 {}; @@ -1969,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 { }; @@ -2560,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; @@ -2764,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 { }; @@ -3038,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 { }; @@ -3439,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; @@ -3743,7 +3752,7 @@ in fontforge-fonttools = callPackage ../tools/misc/fontforge/fontforge-fonttools.nix {}; - fontmatrix = callPackage ../applications/graphics/fontmatrix {}; + fontmatrix = libsForQt514.callPackage ../applications/graphics/fontmatrix {}; foremost = callPackage ../tools/system/foremost { }; @@ -3817,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 @@ -4378,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 { }; @@ -4466,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 { }; @@ -4664,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 { }; @@ -6399,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 { }; @@ -6498,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 { }; @@ -6754,9 +6775,7 @@ in rubocop = callPackage ../development/tools/rubocop { }; - runelite = callPackage ../games/runelite { - jre = openjdk11; - }; + runelite = callPackage ../games/runelite { }; runningx = callPackage ../tools/X11/runningx { }; @@ -8170,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 {}; @@ -8384,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; @@ -8464,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 { }; @@ -9173,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 @@ -9213,7 +9242,10 @@ in }; }; - /* current JDK */ + jdk11 = openjdk11; + jdk11_headless = openjdk11_headless; + + /* Latest JDK */ openjdk14 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin { } @@ -9229,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; @@ -9289,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 { }; @@ -9430,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 { }; @@ -9485,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 { }; @@ -9731,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 { @@ -9773,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; }; @@ -9963,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 @@ -10070,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 { }; @@ -10441,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; @@ -10458,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 { }; @@ -10634,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)"; @@ -10978,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 { }; @@ -11013,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 { }; @@ -11040,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; @@ -11219,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 { }; @@ -11888,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 { }; @@ -12340,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; @@ -12403,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; @@ -12862,8 +12928,6 @@ in herqq = libsForQt514.callPackage ../development/libraries/herqq { }; - heyefi = haskellPackages.heyefi; - hidapi = callPackage ../development/libraries/hidapi { }; highfive = callPackage ../development/libraries/highfive { }; @@ -13824,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 { }; @@ -14541,9 +14607,7 @@ in nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { }; - nvtop = callPackage ../tools/system/nvtop { - nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; - }; + nvtop = callPackage ../tools/system/nvtop { }; ocl-icd = callPackage ../development/libraries/ocl-icd { }; @@ -14576,7 +14640,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 { }; @@ -15087,7 +15153,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 {}; @@ -15157,8 +15226,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 { }; @@ -15417,7 +15486,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 { }; @@ -16015,7 +16086,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 { }; @@ -16046,6 +16119,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 @@ -16155,6 +16231,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 { @@ -16239,18 +16316,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 { }; @@ -16354,9 +16439,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; @@ -17139,7 +17229,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 { }; @@ -19744,6 +19836,10 @@ in gtk = gtk3; }; + bluej = callPackage ../applications/editors/bluej/default.nix { + jdk = jetbrains.jdk; + }; + bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { }; blugon = callPackage ../applications/misc/blugon { }; @@ -20679,9 +20775,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 {}; @@ -21347,7 +21448,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 { }; @@ -21628,6 +21729,7 @@ in (libreoffice-args // { icu = icu64; variant = "still"; + jdk = jdk8; }); }); libreoffice-still-unwrapped = libreoffice-still.libreoffice; @@ -21803,7 +21905,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 { }; @@ -22509,7 +22611,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 { }; @@ -22631,7 +22735,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 { }; @@ -22944,6 +23050,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 {}); @@ -23105,8 +23212,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; }) ); @@ -23729,6 +23841,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 { @@ -23815,7 +23928,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 { }; @@ -24118,11 +24234,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 {}); @@ -25653,7 +25777,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 { }; @@ -26143,7 +26269,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 {}; @@ -26277,7 +26405,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; }; @@ -26598,7 +26728,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 { }; @@ -27174,6 +27308,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 b0bf49fe1033b..3012a8f88cf33 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -713,6 +713,8 @@ in { azure-synapse-spark = callPackage ../development/python-modules/azure-synapse-spark { }; + b2sdk = callPackage ../development/python-modules/b2sdk { }; + Babel = callPackage ../development/python-modules/Babel { }; babelfish = callPackage ../development/python-modules/babelfish { }; @@ -1311,6 +1313,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 { }; @@ -2764,6 +2768,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 { }; @@ -4032,6 +4038,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 { }; @@ -5377,6 +5385,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 { }; @@ -6459,7 +6469,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 { }; @@ -6921,6 +6933,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 { }; @@ -7569,6 +7583,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 { }; |